upgraded berkshelf to make it work again, updated Berksfile format

Author: Cam Cope

Berksfile

@@ -1,4 +1,4 @@
-site :opscode
+source "https://api.berkshelf.com"
 
 metadata
 

Berksfile.lock

@@ -1,25 +1,24 @@
-{
-  "sources": {
-    "python": {
-      "path": "."
-    },
-    "minitest-handler": {
-      "locked_version": "1.1.2"
-    },
-    "apt": {
-      "locked_version": "2.3.4"
-    },
-    "yum": {
-      "locked_version": "3.0.2"
-    },
-    "build-essential": {
-      "locked_version": "1.4.2"
-    },
-    "python_test": {
-      "path": "./test/cookbooks/python_test"
-    },
-    "chef_handler": {
-      "locked_version": "1.1.4"
-    }
-  }
-}
+DEPENDENCIES
+  apt
+  build-essential
+  minitest-handler
+  python
+    path: .
+    metadata: true
+  python_test
+    path: test/cookbooks/python_test
+  yum
+
+GRAPH
+  apt (2.5.3)
+  build-essential (2.0.6)
+  chef_handler (1.1.6)
+  minitest-handler (1.3.2)
+    chef_handler (>= 0.0.0)
+  python (1.4.7)
+    build-essential (>= 0.0.0)
+    yum-epel (>= 0.0.0)
+  python_test (0.1.0)
+  yum (3.3.1)
+  yum-epel (0.5.1)
+    yum (~> 3.0)

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'foodcritic', '>= 3.0.3'
-gem 'berkshelf', '~> 2.0'
+gem 'foodcritic', '~> 3.0'
+gem 'berkshelf', '~> 3.0'
 gem 'chefspec', '~> 3.0'

Gemfile.lock

@@ -1,82 +1,80 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.16)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    akami (1.2.0)
-      gyoku (>= 0.4.0)
-      nokogiri (>= 1.4.0)
-    berkshelf (2.0.10)
-      activesupport (~> 3.2.0)
+    addressable (2.3.6)
+    berkshelf (3.1.5)
       addressable (~> 2.3.4)
+      berkshelf-api-client (~> 1.2)
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
       buff-shell_out (~> 0.1)
-      chozo (>= 0.6.1)
-      faraday (>= 0.8.5)
-      hashie (>= 2.0.2)
+      celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
+      faraday (~> 0.9.0)
       minitar (~> 0.5.4)
-      rbzip2 (~> 0.2.0)
+      octokit (~> 3.0)
       retryable (~> 1.3.3)
-      ridley (~> 1.5.0)
-      solve (>= 0.5.0)
-      thor (~> 0.18.0)
-    buff-config (0.4.0)
-      buff-extensions (~> 0.3)
-      varia_model (~> 0.1)
-    buff-extensions (0.5.0)
+      ridley (~> 4.0)
+      solve (~> 1.1)
+      thor (~> 0.18)
+    berkshelf-api-client (1.2.0)
+      faraday (~> 0.9.0)
+    buff-config (1.0.1)
+      buff-extensions (~> 1.0)
+      varia_model (~> 0.4)
+    buff-extensions (1.0.0)
     buff-ignore (1.1.1)
     buff-ruby_engine (0.1.0)
-    buff-shell_out (0.1.1)
+    buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
-    builder (3.2.2)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
-    celluloid-io (0.14.1)
-      celluloid (>= 0.14.1)
-      nio4r (>= 0.4.5)
-    chef (11.8.0)
-      chef-zero (~> 1.6, >= 1.6.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    celluloid-io (0.16.0)
+      celluloid (>= 0.16.0)
+      nio4r (>= 1.0.0)
+    chef (11.14.6)
+      chef-zero (~> 2.1, >= 2.1.4)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
+      ffi-yajl (~> 1.0)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
       mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.3)
+      mixlib-cli (~> 1.4)
       mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.2)
+      mixlib-shellout (~> 1.4)
       net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (~> 6.0)
+      net-ssh-multi (~> 1.1)
+      ohai (~> 7.2)
+      plist (~> 3.1.0)
       pry (~> 0.9)
-      puma (~> 1.6)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    chef-zero (1.7.2)
+      rest-client (>= 1.0.4, <= 1.6.7)
+    chef-zero (2.2)
       hashie (~> 2.0)
       json
       mixlib-log (~> 1.3)
-      moneta (< 0.7.0)
       rack
-    chefspec (3.0.2)
+    chefspec (3.4.0)
       chef (~> 11.0)
       fauxhai (~> 2.0)
       rspec (~> 2.14)
-    chozo (0.6.1)
-      activesupport (>= 3.2.0)
-      hashie (>= 2.0.2)
-      multi_json (>= 1.3.0)
     coderay (1.1.0)
+    dep-selector-libgecode (1.0.2)
+    dep_selector (1.0.3)
+      dep-selector-libgecode (~> 1.0)
+      ffi (~> 1.9)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    fauxhai (2.0.1)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    fauxhai (2.2.0)
       net-ssh
       ohai
     ffi (1.9.3)
+    ffi-yajl (1.1.0)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.0)
     foodcritic (3.0.3)
       erubis
       gherkin (~> 2.11.7)
@@ -86,85 +84,73 @@ GEM
       yajl-ruby (~> 1.1.0)
     gherkin (2.11.8)
       multi_json (~> 1.3)
-    gssapi (1.0.3)
-      ffi (>= 1.0.1)
-    gyoku (1.1.0)
-      builder (>= 2.1.2)
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpclient (2.3.4.1)
-    httpi (0.9.7)
-      rack
-    i18n (0.6.9)
+    hashie (2.1.2)
+    highline (1.6.21)
+    hitimes (1.2.2)
     ipaddress (0.8.0)
-    json (1.7.7)
-    little-plugger (1.1.3)
-    logging (1.8.1)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.3.6)
+    json (1.8.1)
+    libyajl2 (1.0.1)
     method_source (0.8.2)
     mime-types (1.25.1)
     minitar (0.5.4)
     mixlib-authentication (1.3.0)
       mixlib-log
-    mixlib-cli (1.4.0)
+    mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.3.0)
-    moneta (0.6.0)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
-    net-http-persistent (2.9)
-    net-ssh (2.7.0)
+    mixlib-shellout (1.4.0)
+    multi_json (1.10.1)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
+    net-ssh (2.9.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
-    nio4r (0.5.0)
+    net-ssh-multi (1.2.0)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    nio4r (1.0.1)
     nokogiri (1.5.11)
-    nori (1.1.5)
-    ohai (6.20.0)
+    octokit (3.3.1)
+      sawyer (~> 0.5.3)
+    ohai (7.4.0)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.0)
       ipaddress
+      mime-types (~> 1.16)
       mixlib-cli
-      mixlib-config
+      mixlib-config (~> 2.0)
       mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    polyglot (0.3.3)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+      mixlib-shellout (~> 1.2)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    plist (3.1.0)
+    polyglot (0.3.5)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (1.6.3)
-      rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.1)
-    rbzip2 (0.2.0)
+    rake (10.3.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    retryable (1.3.3)
-    ridley (1.5.3)
+    retryable (1.3.6)
+    ridley (4.0.0)
       addressable
-      buff-config (~> 0.2)
-      buff-extensions (~> 0.3)
+      buff-config (~> 1.0)
+      buff-extensions (~> 1.0)
       buff-ignore (~> 1.1)
       buff-shell_out (~> 0.1)
-      celluloid (~> 0.14.0)
-      celluloid-io (~> 0.14.0)
+      celluloid (~> 0.16.0.pre)
+      celluloid-io (~> 0.16.0.pre)
       erubis
-      faraday (>= 0.8.4)
-      hashie (>= 2.0.2)
+      faraday (~> 0.9.0)
+      hashie (>= 2.0.2, < 3.0.0)
       json (>= 1.7.7)
       mixlib-authentication (>= 1.3.0)
       net-http-persistent (>= 2.8)
-      net-ssh
-      nio4r (>= 0.5.0)
       retryable
-      solve (>= 0.4.4)
-      varia_model (~> 0.1)
-      winrm (~> 1.1.0)
+      semverse (~> 1.1)
+      varia_model (~> 0.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -173,43 +159,31 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
-    rubyntlm (0.1.1)
-    savon (0.9.5)
-      akami (~> 1.0)
-      builder (>= 2.1.2)
-      gyoku (>= 0.4.0)
-      httpi (~> 0.9)
-      nokogiri (>= 1.4.0)
-      nori (~> 1.0)
-      wasabi (~> 1.0)
-    slop (3.4.7)
-    solve (0.8.2)
-    systemu (2.5.2)
-    thor (0.18.1)
-    timers (1.1.0)
+    sawyer (0.5.5)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    semverse (1.2.1)
+    slop (3.6.0)
+    solve (1.2.1)
+      dep_selector (~> 1.0)
+      semverse (~> 1.1)
+    systemu (2.6.4)
+    thor (0.19.1)
+    timers (4.0.0)
+      hitimes
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    uuidtools (2.1.4)
-    varia_model (0.2.0)
-      buff-extensions (~> 0.2)
-      hashie (>= 2.0.2)
-    wasabi (1.0.0)
-      nokogiri (>= 1.4.0)
-    winrm (1.1.3)
-      gssapi (~> 1.0.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (~> 1.6, >= 1.6.1)
-      nokogiri (~> 1.5)
-      rubyntlm (~> 0.1.1)
-      savon (= 0.9.5)
-      uuidtools (~> 2.1.2)
+    varia_model (0.4.0)
+      buff-extensions (~> 1.0)
+      hashie (>= 2.0.2, < 3.0.0)
+    wmi-lite (1.0.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  berkshelf (~> 2.0)
+  berkshelf (~> 3.0)
   chefspec (~> 3.0)
-  foodcritic (>= 3.0.3)
+  foodcritic (~> 3.0)