upgrade gems and cookbooks.

13 files changed, 33 insertions, 182 deletions

diff --git a/Berksfile b/Berksfile
index 2cef776..967b9a7 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,5 +1,3 @@
-source "https://api.berkshelf.com"
+source "https://supermarket.chef.io"
 
 metadata
-
-cookbook "rbenv", git: 'git://github.com/fnichol/chef-rbenv.git'
diff --git a/Berksfile.lock b/Berksfile.lock
index 6e10850..eb5fc87 100644
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -1,32 +1,30 @@
 DEPENDENCIES
-  rbenv
-    git: git://github.com/fnichol/chef-rbenv.git
-    revision: 0a3018634bafe58ad21c6ee271af015220e444b9
   stronglifters-rails
     path: .
     metadata: true
 
 GRAPH
-  apt (2.7.0)
-  build-essential (2.2.3)
-  chef-sugar (3.1.0)
-  database (4.0.6)
+  apt (2.9.2)
+  build-essential (2.2.4)
+  chef-sugar (3.1.1)
+  database (4.0.9)
     postgresql (>= 1.0.0)
-  java (1.31.0)
-  openssl (4.0.0)
-    chef-sugar (>= 0.0.0)
-  postgresql (3.4.20)
+  java (1.36.0)
+    apt (>= 0.0.0)
+  openssl (4.4.0)
+    chef-sugar (>= 3.1.1)
+  postgresql (3.4.21)
     apt (>= 1.9.0)
     build-essential (>= 0.0.0)
-    openssl (~> 4.0.0)
-  rbenv (0.7.3)
+    openssl (~> 4.0)
+  ruby_build (0.8.0)
+  ruby_rbenv (1.0.1)
     java (> 1.4.0)
     ruby_build (>= 0.0.0)
-  ruby_build (0.8.0)
   stronglifters-rails (0.1.0)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
     database (>= 0.0.0)
     postgresql (>= 0.0.0)
-    rbenv (>= 0.0.0)
     ruby_build (>= 0.0.0)
+    ruby_rbenv (>= 0.0.0)
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 68e3d7b..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,13 +0,0 @@
-stronglifters-rails CHANGELOG
-=======================
-
-This file is used to list changes made in each version of the stronglifters-rails cookbook.
-
-0.1.0
------
-- [your_name] - Initial release of stronglifters-rails
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
diff --git a/Gemfile b/Gemfile
index daa2d37..923ae55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,14 +9,6 @@ group :test do
   gem 'strainer'
   gem 'test-kitchen'
   gem 'kitchen-vagrant'
-  gem 'kitchen-docker'
-  gem 'kitchen-lxc'
-  gem 'knife-spork'
-  gem 'hipchat'
-
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-shell'
-
+  gem 'kitchen-sync'
   gem 'ffaker'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 228c495..fe84131 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,9 +2,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    annoy (0.5.6)
-      highline (>= 1.5.0)
-    app_conf (0.4.2)
     berkshelf (4.0.1)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 2.0)
@@ -75,8 +72,6 @@ GEM
       chef (>= 11.14)
       fauxhai (~> 2.3)
       rspec (~> 3.0)
-    childprocess (0.5.7)
-      ffi (~> 1.0, >= 1.0.11)
     cleanroom (1.0.0)
     coderay (1.1.0)
     dep-selector-libgecode (1.0.2)
@@ -84,12 +79,6 @@ GEM
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
     diff-lcs (1.2.5)
-    diffy (3.0.7)
-    docile (1.1.5)
-    drydock (0.6.9)
-    elecksee (1.1.8)
-      childprocess
-      rye
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -108,59 +97,22 @@ GEM
       rufus-lru (~> 1.0)
       treetop (~> 1.4)
       yajl-ruby (~> 1.1)
-    formatador (0.2.5)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    git (1.2.9.1)
-    guard (2.13.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.6.4)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-shell (0.7.1)
-      guard (>= 2.0.0)
-      guard-compat (~> 1.0)
     hashie (3.4.3)
     highline (1.7.8)
-    hipchat (1.5.2)
-      httparty
-      mimemagic
     hitimes (1.2.3)
-    httparty (0.13.7)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
     httpclient (2.6.0.1)
     ipaddress (0.8.0)
     json (1.8.3)
-    kitchen-docker (2.3.0)
+    kitchen-sync (1.1.1)
+      net-sftp
       test-kitchen (>= 1.0.0)
-    kitchen-lxc (0.1.4)
-      elecksee (~> 1.0, >= 1.0.22)
-      test-kitchen (~> 1.2, >= 1.2.1)
     kitchen-vagrant (0.19.0)
       test-kitchen (~> 1.4)
-    knife-spork (1.6.1)
-      app_conf (>= 0.4.0)
-      chef (>= 11.0.0)
-      diffy (>= 3.0.1)
-      git (>= 1.2.5)
     libyajl2 (1.2.0)
-    listen (3.0.4)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
     method_source (0.8.2)
     mime-types (2.6.2)
-    mimemagic (0.3.0)
     mini_portile (0.6.2)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
@@ -170,11 +122,11 @@ GEM
     mixlib-log (1.6.0)
     mixlib-shellout (2.2.3)
     multi_json (1.11.2)
-    multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
@@ -185,9 +137,6 @@ GEM
     nio4r (1.1.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    notiffany (0.0.8)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
     octokit (3.8.0)
       sawyer (~> 0.6.0, >= 0.5.3)
     ohai (8.7.0)
@@ -211,9 +160,6 @@ GEM
       slop (~> 3.4)
     rack (1.6.4)
     rake (10.4.2)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
     retryable (2.0.3)
     ridley (4.3.2)
       addressable
@@ -252,13 +198,6 @@ GEM
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
     rufus-lru (1.0.5)
-    rye (0.9.13)
-      annoy
-      docile (>= 1.0.1)
-      highline (>= 1.5.1)
-      net-scp (>= 1.0.2)
-      net-ssh (>= 2.0.13)
-      sysinfo (>= 0.8.1)
     safe_yaml (1.0.4)
     sawyer (0.6.0)
       addressable (~> 2.3.5)
@@ -270,7 +209,6 @@ GEM
       rspec-its
       specinfra (~> 2.43)
     sfl (2.2)
-    shellany (0.0.1)
     slop (3.6.0)
     solve (1.2.1)
       dep_selector (~> 1.0)
@@ -280,13 +218,9 @@ GEM
       net-ssh (~> 2.7)
       net-telnet
       sfl
-    storable (0.8.9)
     strainer (0.2.1)
       chef (>= 10.10)
       term-ansicolor (~> 1.0.7)
-    sysinfo (0.8.1)
-      drydock
-      storable
     syslog-logger (1.6.8)
     systemu (2.6.5)
     term-ansicolor (1.0.7)
@@ -316,14 +250,8 @@ DEPENDENCIES
   chefspec
   ffaker
   foodcritic
-  guard
-  guard-rspec
-  guard-shell
-  hipchat
-  kitchen-docker
-  kitchen-lxc
+  kitchen-sync
   kitchen-vagrant
-  knife-spork
   rake
   strainer
   test-kitchen
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index 5cc7938..0000000
--- a/Guardfile
+++ /dev/null
@@ -1,11 +0,0 @@
-guard :rspec, cmd: "bin/rspec" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{recipes/(.+)\.rb$})  { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { 'spec' }
-end
-
-guard :shell do
-  watch(%r{recipes/(.+)\.rb$}) do |m| 
-    system("bin/foodcritic .")
-  end
-end
diff --git a/README.md b/README.md
index 08c14cd..fccd799 100644
--- a/README.md
+++ b/README.md
@@ -2,62 +2,10 @@
 
 stronglifters-rails Cookbook
 ======================
-TODO: Enter the cookbook description here.
-
-e.g.
-This cookbook makes your favorite breakfast sandwich.
-
-Requirements
-------------
-TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
-
-e.g.
-#### packages
-- `toaster` - stronglifters-rails needs toaster to brown your bagel.
-
-Attributes
-----------
-TODO: List your cookbook attributes here.
-
-e.g.
-#### stronglifters-rails::default
-<table>
-  <tr>
-    <th>Key</th>
-    <th>Type</th>
-    <th>Description</th>
-    <th>Default</th>
-  </tr>
-  <tr>
-    <td><tt>['stronglifters-rails']['bacon']</tt></td>
-    <td>Boolean</td>
-    <td>whether to include bacon</td>
-    <td><tt>true</tt></td>
-  </tr>
-</table>
-
-Usage
------
-#### stronglifters-rails::default
-TODO: Write usage instructions for each cookbook.
-
-e.g.
-Just include `stronglifters-rails` in your node's `run_list`:
-
-```json
-{
-  "name":"my_node",
-  "run_list": [
-    "recipe[stronglifters-rails]"
-  ]
-}
-```
 
 Contributing
 ------------
-TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section.
 
-e.g.
 1. Fork the repository on Github
 2. Create a named feature branch (like `add_component_x`)
 3. Write your change
@@ -67,4 +15,4 @@ e.g.
 
 License and Authors
 -------------------
-Authors: TODO: List authors
+Authors: mo 
diff --git a/definitions/.gitkeep b/definitions/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/definitions/.gitkeep
+++ /dev/null
diff --git a/libraries/.gitkeep b/libraries/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/libraries/.gitkeep
+++ /dev/null
diff --git a/metadata.rb b/metadata.rb
index b741610..87a0c79 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -11,4 +11,4 @@ depends "build-essential"
 depends "database"
 depends "postgresql"
 depends "ruby_build"
-depends "rbenv"
+depends "ruby_rbenv"
diff --git a/providers/.gitkeep b/providers/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/providers/.gitkeep
+++ /dev/null
diff --git a/resources/.gitkeep b/resources/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/resources/.gitkeep
+++ /dev/null
diff --git a/test/web/serverspec/default_spec.rb b/test/web/serverspec/default_spec.rb
new file mode 100644
index 0000000..322766b
--- /dev/null
+++ b/test/web/serverspec/default_spec.rb
@@ -0,0 +1,11 @@
+require "serverspec"
+
+set :backend, :exec
+
+describe "web" do
+  it 'starts nginx' do
+    expect(service("nginx")).to be_running
+    expect(port(80)).to be_listening
+    expect(port(443)).to be_listening
+  end
+end