berkshelf 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb12888199733e39e358955461665041ea8e137c
-  data.tar.gz: 55a60520ae364fd60abbd9dd9a78307de991e1f4
+  metadata.gz: 4bc1d114a16270012c8e6554bdeeef10c8daeb60
+  data.tar.gz: 097633f8a8909d0e1d2a3c5d68c17576723aa62f
 SHA512:
-  metadata.gz: a8ad24b006d9100ebcf2f59756b1e7b75c000f6037b59ee26a222b664568e13fedfe5e3f2b6e74a14e1d4ae01eef231528f34fa83a69d83fa0c3c0f3a3a5ea63
-  data.tar.gz: cb71aa0a1e98e05e4c32053be7da598628ccacf4ec72b476bb85c2b32f03495f0d62339541d6596a2af8cfed24532e868292f848115b0617d509fcbe80cb475a
+  metadata.gz: 9d600075727841156d0ef1fb24c5f0577b7f657acd299d7743901b499db08a83ff482f9c937b3d026609fa53a67d619c1a826a2705676ce3cd3697739404bb69
+  data.tar.gz: f845e6cd2bb95e7e90dd3b267d4c9d06f7692c09d299b4b2068b945c1c68fdc2f0caba8bc740c4378e1999ccf7280456f0335a805940ab659ecc6965607c3604

data/CHANGELOG.md

@@ -1,10 +1,27 @@
 # Change Log
 
-## [5.0.0](https://github.com/berkshelf/berkshelf/tree/5.0.0) (2016-08-09)
-[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v4.3.5...5.0.0)
+## [5.1.0](https://github.com/berkshelf/berkshelf/tree/5.1.0) (2016-09-16)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.0.0...5.1.0)
 
 **Merged pull requests:**
 
+- Disable caching of bundler since it's broken [\#1612](https://github.com/berkshelf/berkshelf/pull/1612) ([thommay](https://github.com/thommay))
+- Update cli.rb [\#1611](https://github.com/berkshelf/berkshelf/pull/1611) ([martinmosegaard](https://github.com/martinmosegaard))
+- fix cucumber tests [\#1609](https://github.com/berkshelf/berkshelf/pull/1609) ([mwrock](https://github.com/mwrock))
+- Enable appveyor [\#1606](https://github.com/berkshelf/berkshelf/pull/1606) ([thommay](https://github.com/thommay))
+- fix syncing windows user directories on ruby 2.3 [\#1605](https://github.com/berkshelf/berkshelf/pull/1605) ([mwrock](https://github.com/mwrock))
+- Update buff-shell\_out to 1.0 [\#1604](https://github.com/berkshelf/berkshelf/pull/1604) ([jkeiser](https://github.com/jkeiser))
+- Only fall back to cp/rm if we have to [\#1602](https://github.com/berkshelf/berkshelf/pull/1602) ([thommay](https://github.com/thommay))
+- Expose configuration for API timeouts [\#1601](https://github.com/berkshelf/berkshelf/pull/1601) ([thommay](https://github.com/thommay))
+- Only optionally remove the contents of the target [\#1599](https://github.com/berkshelf/berkshelf/pull/1599) ([thommay](https://github.com/thommay))
+
+## [v5.0.0](https://github.com/berkshelf/berkshelf/tree/v5.0.0) (2016-08-30)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v4.3.5...v5.0.0)
+
+**Merged pull requests:**
+
+- Atomically move git located cookbook to cache [\#1598](https://github.com/berkshelf/berkshelf/pull/1598) ([kamaradclimber](https://github.com/kamaradclimber))
+- Faild `berks install` with ENV\['BERKSHELF\_PATH'\] [\#1595](https://github.com/berkshelf/berkshelf/pull/1595) ([hirocaster](https://github.com/hirocaster))
 - Add Ruby 2.3 and Ruby 2.4 support - drop Ruby 2.1 support and older [\#1591](https://github.com/berkshelf/berkshelf/pull/1591) ([lamont-granquist](https://github.com/lamont-granquist))
 - bump berkshelf-api and associated deps [\#1589](https://github.com/berkshelf/berkshelf/pull/1589) ([lamont-granquist](https://github.com/lamont-granquist))
 - force encoding to UTF-8 [\#1588](https://github.com/berkshelf/berkshelf/pull/1588) ([lamont-granquist](https://github.com/lamont-granquist))

data/Gemfile.lock

@@ -19,12 +19,12 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (5.0.0)
+    berkshelf (5.1.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
-      buff-shell_out (~> 0.1)
+      buff-shell_out (~> 1.0)
       cleanroom (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
@@ -39,7 +39,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -48,8 +48,8 @@ GEM
     addressable (2.4.0)
     archive (0.0.6)
       ffi (~> 1.9.3)
-    artifactory (2.3.3)
-    aruba (0.14.1)
+    artifactory (2.4.0)
+    aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -70,24 +70,25 @@ GEM
       varia_model (~> 0.6)
     buff-extensions (2.0.0)
     buff-ignore (1.2.0)
-    buff-ruby_engine (0.1.0)
-    buff-shell_out (0.2.0)
-      buff-ruby_engine (~> 0.1.0)
+    buff-ruby_engine (1.0.0)
+    buff-shell_out (1.1.0)
+      buff-ruby_engine (~> 1.0)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.12.15)
-      fuzzyurl (~> 0.8.0)
+    chef-config (12.14.60)
+      addressable
+      fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (4.8.0)
+    chef-zero (5.1.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
-      rack (< 2)
+      rack (~> 2.0)
       uuidtools (~> 2.1)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
@@ -119,7 +120,7 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160615)
+    domain_name (0.5.20160826)
       unf (>= 0.0.5, < 1.0.0)
     enumerable-lazy (0.0.1)
     equalizer (0.0.11)
@@ -127,21 +128,20 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.14)
-    ffi (1.9.14-x86-mingw32)
     ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
     formatador (0.2.5)
-    fuubar (2.1.1)
-      rspec (~> 3.0)
+    fuubar (2.2.0)
+      rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    fuzzyurl (0.8.0)
+    fuzzyurl (0.9.0)
     gherkin (4.0.0)
-    github_api (0.14.4)
+    github_api (0.14.5)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      oauth2 (~> 1.0.0)
+      oauth2 (~> 1.0)
     github_changelog_generator (1.11.3)
       bundler (>= 1.7)
       colorize (~> 0.7)
@@ -199,7 +199,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.1)
     http_parser.rb (0.6.0)
-    httpclient (2.8.0)
+    httpclient (2.8.2.4)
     i18n (0.7.0)
     ice_nine (0.11.2)
     iniparse (1.4.2)
@@ -218,20 +218,16 @@ GEM
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
-    mixlib-config (2.2.1)
+    mixlib-config (2.2.4)
     mixlib-install (1.1.0)
       artifactory
       mixlib-shellout
       mixlib-versioning
-    mixlib-log (1.7.0)
-    mixlib-shellout (2.2.6)
-    mixlib-shellout (2.2.6-universal-mingw32)
-      win32-process (~> 0.8.2)
-      wmi-lite (~> 1.0)
+    mixlib-log (1.7.1)
+    mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.0)
+    molinillo (0.5.1)
     msgpack (1.0.0)
-    msgpack (1.0.0-x86-mingw32)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multi_xml (0.5.5)
@@ -242,19 +238,21 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     nio4r (1.2.1)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (1.0.0)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    overcommit (0.34.2)
+    overcommit (0.36.0)
       childprocess (~> 0.5.8)
       iniparse (~> 1.4)
     parser (2.3.1.2)
@@ -264,7 +262,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rainbow (2.1.0)
@@ -279,12 +277,12 @@ GEM
       http_parser.rb (>= 0.6.0)
       websocket-driver (>= 0.5.1)
     retryable (2.0.4)
-    ridley (5.0.0)
+    ridley (5.1.0)
       addressable
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
       buff-ignore (~> 1.2)
-      buff-shell_out (~> 0.1)
+      buff-shell_out (~> 1.0)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
@@ -301,7 +299,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -329,11 +327,12 @@ GEM
       molinillo (~> 0.4)
       semverse (>= 1.1, < 3.0)
     spork (0.9.2)
-    test-kitchen (1.10.2)
+    test-kitchen (1.12.0)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 4.0)
+      net-ssh-gateway (~> 1.2.0)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
     thor (0.19.1)
@@ -345,8 +344,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unf_ext (0.0.7.2-x86-mingw32)
-    unicode-display_width (1.1.0)
+    unicode-display_width (1.1.1)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
     varia_model (0.6.0)
@@ -364,14 +362,10 @@ GEM
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    win32-process (0.8.3)
-      ffi (>= 1.0.0)
-    wmi-lite (1.0.0)
     yard (0.9.5)
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   activesupport (~> 4.0)

data/Rakefile

@@ -1,5 +1,27 @@
 require "bundler/gem_tasks"
 
+begin
+  require "rspec/core/rake_task"
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  puts "Rspec not available"
+  task :spec
+end
+
+WINDOWS_PLATFORM = /mswin|win32|mingw/ unless defined? WINDOWS_PLATFORM
+
+begin
+  require "cucumber"
+  require "cucumber/rake/task"
+  Cucumber::Rake::Task.new(:features) do |t|
+    if RUBY_PLATFORM =~ WINDOWS_PLATFORM
+      t.cucumber_opts = "--tags ~@not-windows"
+    end
+  end
+rescue LoadError
+  task :features
+end
+
 begin
   require "github_changelog_generator/task"
 
@@ -12,3 +34,10 @@ begin
   end
 rescue LoadError
 end
+
+task default: [:spec, :features]
+task :ci do
+  ENV["CI"] = "true"
+  Rake::Task[:spec].invoke
+  Rake::Task[:features].invoke
+end

data/appveyor.yml

@@ -0,0 +1,31 @@
+version: "master-{build}"
+
+os: Windows Server 2012 R2
+platform:
+  - x64
+
+clone_depth: 1
+skip_tags: true
+skip_branch_with_pr: true
+branches:
+  only:
+    - master
+
+# caching vendor/bundle appears to break horribly in the face of gems checked out of git
+# cache:
+#   - vendor/bundle
+
+install:
+  - ps: iex (irm https://omnitruck.chef.io/install.ps1); Install-Project -Project chefdk -channel current
+  - bundle config --local path vendor/bundle
+  - SET CI=true
+  - SET BUNDLE_WITHOUT=guard:changelog:style
+
+build_script:
+  - ps: c:\opscode\chefdk\bin\chef.bat shell-init powershell | iex
+  - bundle install || bundle install || bundle install
+
+test_script:
+  - SET SPEC_OPTS=--format progress
+  - c:\opscode\chefdk\bin\chef.bat exec bundle exec rake spec
+  - c:\opscode\chefdk\bin\chef.bat exec bundle exec cucumber --tags ~@not-windows

data/berkshelf.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'berkshelf-api-client', '>= 2.0.2', '< 4.0'
   s.add_dependency 'buff-config',          '~> 2.0'
   s.add_dependency 'buff-extensions',      '~> 2.0'
-  s.add_dependency 'buff-shell_out',       '~> 0.1'
+  s.add_dependency 'buff-shell_out',       '~> 1.0'
   s.add_dependency 'cleanroom',            '~> 1.0'
   s.add_dependency 'faraday',              '~> 0.9'
   s.add_dependency 'httpclient',           '~> 2.7'

data/features/commands/install.feature

@@ -204,7 +204,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at master)
-      Fetching cookbook index from http://0.0.0.0:26210...
+      Fetching cookbook index from http://127.0.0.1:26210...
       Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at master)
       """
 
@@ -235,7 +235,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at rel/cookbooks/berkshelf-cookbook-fixture)
-      Fetching cookbook index from http://0.0.0.0:26210...
+      Fetching cookbook index from http://127.0.0.1:26210...
       Using berkshelf-cookbook-fixture (1.0.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at rel/cookbooks/berkshelf-cookbook-fixture)
       """
 
@@ -263,7 +263,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
-      Fetching cookbook index from http://0.0.0.0:26210...
+      Fetching cookbook index from http://127.0.0.1:26210...
       Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
       """
 
@@ -278,7 +278,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
-      Fetching cookbook index from http://0.0.0.0:26210...
+      Fetching cookbook index from http://127.0.0.1:26210...
       Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
       """
 
@@ -293,7 +293,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
-      Fetching cookbook index from http://0.0.0.0:26210...
+      Fetching cookbook index from http://127.0.0.1:26210...
       Using berkshelf-cookbook-fixture (0.2.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at 70a527e)
       """
 
@@ -308,7 +308,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
-      Fetching cookbook index from http://0.0.0.0:26210...
+      Fetching cookbook index from http://127.0.0.1:26210...
       Using berkshelf-cookbook-fixture (0.2.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
       """
 
@@ -323,7 +323,7 @@ Feature: berks install
     And the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
-      Fetching cookbook index from http://0.0.0.0:26210...
+      Fetching cookbook index from http://127.0.0.1:26210...
       Using berkshelf-cookbook-fixture (0.2.0) from https://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v0.2.0)
       """
 
@@ -476,7 +476,7 @@ Feature: berks install
     Then the output should contain:
       """
       Fetching 'berkshelf-cookbook-fixture' from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v1.0.0)
-      Fetching cookbook index from http://0.0.0.0:26210...
+      Fetching cookbook index from http://127.0.0.1:26210...
       Using berkshelf-cookbook-fixture (1.0.0) from git://github.com/RiotGames/berkshelf-cookbook-fixture.git (at v1.0.0)
       """
 

data/features/commands/search.feature

@@ -8,9 +8,10 @@ Feature: berks search
 
   Scenario: Searching for a cookbook by partial name
     * I successfully run `berks search berkshelf-`
-    * the output should contain:
+    * the results should have the cookbooks:
       """
       berkshelf-api (1.2.2)
       berkshelf-api-server (2.2.0)
       berkshelf-cookbook-fixture (1.0.0)
       """
+    * the results should each start with "berkshelf-"

data/features/commands/shelf/uninstall.feature

@@ -59,7 +59,9 @@ Feature: berks shelf uninstall
       | fake | 1.2.0 |
       | fake | 2.0.0 |
 
-  @spawn
+      # FIXME: there seems to be a bug in aruba on windows related to
+      # interactive stuff that i fully don't understand
+  @spawn @not-windows
   Scenario: With contingencies
     Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
       | ekaf | 2.3.4 |

data/features/commands/vendor.feature

@@ -28,7 +28,7 @@ Feature: Vendoring cookbooks to a directory
       metadata
       """
     When I successfully run `berks vendor cukebooks`
-    And the directory "cukebooks/fake" should contain version "0.0.0" of the "fake" cookbook
+    Then the directory "cukebooks/fake" should contain version "0.0.0" of the "fake" cookbook
 
   Scenario: vendoring a cookbook with transitive dependencies
     Given I have a Berksfile pointing at the local Berkshelf API with:
@@ -86,7 +86,7 @@ Feature: Vendoring cookbooks to a directory
       cookbook 'fake'
       """
     When I successfully run `berks vendor`
-    And the directory "berks-cookbooks/fake" should contain version "1.0.0" of the "fake" cookbook
+    Then the directory "berks-cookbooks/fake" should contain version "1.0.0" of the "fake" cookbook
 
   Scenario: vendoring to a directory that already exists
     Given I have a Berksfile pointing at the local Berkshelf API with:
@@ -96,8 +96,8 @@ Feature: Vendoring cookbooks to a directory
     And a directory named "cukebooks"
     And a directory named "cukebooks/fake/ponies"
     And a directory named "cukebooks/existing_cookbook"
-    When I successfully run `berks vendor cukebooks`
-    And the directory "cukebooks/fake" should contain version "1.0.0" of the "fake" cookbook
+    When I successfully run `berks vendor --delete cukebooks`
+    Then the directory "cukebooks/fake" should contain version "1.0.0" of the "fake" cookbook
     And a directory named "cukebooks/fake/ponies" should not exist
     And a directory named "cukebooks/existing_cookbook" should not exist
 

data/features/commands/viz.feature

@@ -1,4 +1,4 @@
-@graphviz
+@graphviz @not-windows
 Feature: berks viz
   Scenario: With no options
     * I have a Berksfile pointing at the local Berkshelf API with:

data/features/json_formatter.feature

@@ -18,7 +18,7 @@ Feature: --format json
       {
         "cookbooks": [
           {
-            "api_source": "http://0.0.0.0:26210/",
+            "api_source": "http://127.0.0.1:26210/",
             "location_path": "http://localhost:26310/",
             "version": "1.0.0",
             "name": "berkshelf"
@@ -27,7 +27,7 @@ Feature: --format json
         "errors": [],
         "messages": [
           "Resolving cookbook dependencies...",
-          "Fetching cookbook index from http://0.0.0.0:26210..."
+          "Fetching cookbook index from http://127.0.0.1:26210..."
         ],
         "warnings": []
       }
@@ -53,7 +53,7 @@ Feature: --format json
         "errors": [],
         "messages": [
           "Resolving cookbook dependencies...",
-          "Fetching cookbook index from http://0.0.0.0:26210..."
+          "Fetching cookbook index from http://127.0.0.1:26210..."
         ],
         "warnings": []
       }
@@ -149,7 +149,7 @@ Feature: --format json
           {
             "local": "0.1.0",
             "remote": {
-              "http://0.0.0.0:26210/": "0.2.9"
+              "http://127.0.0.1:26210/": "0.2.9"
             },
             "name": "seth"
           }

data/features/step_definitions/berksfile_steps.rb

@@ -31,7 +31,7 @@ Given /^I have a Berksfile at "(.+)" pointing at the local Berkshelf API with:$/
     Given a directory named "#{path}"
     And a file named "#{path}/Berksfile" with:
       """
-      source 'http://0.0.0.0:#{BERKS_API_PORT}'
+      source 'http://127.0.0.1:#{BERKS_API_PORT}'
 
       #{content}
       """

data/features/step_definitions/cli_steps.rb

@@ -2,3 +2,17 @@ Then /^the exit status should be "(.+)"$/ do |name|
   error = name.split('::').reduce(Berkshelf) { |klass, id| klass.const_get(id) }
   expect(last_command_started).to have_exit_status(error.status_code)
 end
+
+Then /^the results should have the cookbooks:$/ do |cookbooks|
+  list = last_command_started.stdout
+  cookbooks.split("\n").each do |cookbook|
+    expect(list).to  include(cookbook)
+  end
+end
+
+Then /^the results should each start with "(.+)"$/ do |prefix|
+  list = last_command_started.stdout
+  list.split("\n").each do |cookbook|
+    expect(cookbook).to  start_with(prefix)
+  end
+end

data/lib/berkshelf/berksfile.rb

@@ -9,7 +9,7 @@ module Berkshelf
       # @param (see Berksfile#initialize)
       def from_options(options = {})
         options[:berksfile] ||= File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
-        from_file(options[:berksfile], options.slice(:except, :only))
+        from_file(options[:berksfile], options.slice(:except, :only, :delete))
       end
 
       # @param [#to_s] file
@@ -64,6 +64,7 @@ module Berkshelf
       @filepath         = File.expand_path(path)
       @dependencies     = Hash.new
       @sources          = Hash.new
+      @delete           = options[:delete]
 
       # defaults for what solvers to use
       @required_solver  = nil
@@ -668,7 +669,7 @@ module Berkshelf
         #
         #   * https://tickets.opscode.com/browse/CHEF-4811
         #   * https://tickets.opscode.com/browse/CHEF-4810
-        FileSyncer.sync(scratch, destination, exclude: raw_metadata_files + EXCLUDED_VCS_FILES_WHEN_VENDORING)
+        FileSyncer.sync(scratch, destination, exclude: raw_metadata_files + EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: @delete)
       end
 
       destination

data/lib/berkshelf/cli.rb

@@ -184,7 +184,7 @@ module Berkshelf
     method_option :force,
       type: :boolean,
       default: false,
-      desc: 'Upload all cookbook(s) even if a frozen one exists on the Chef Server.'
+      desc: 'Upload all cookbooks even if a frozen one exists on the Chef Server.'
     method_option :ssl_verify,
       type: :boolean,
       default: nil,
@@ -379,6 +379,10 @@ EOF
       type: :array,
       desc: 'Exclude cookbooks that are in these groups.',
       aliases: '-e'
+    method_option :delete,
+      type: :boolean,
+      desc: "Clean the target directory before vendoring",
+      default: false
     method_option :only,
       type: :array,
       desc: 'Only cookbooks that are in these groups.',

data/lib/berkshelf/config.rb

@@ -75,6 +75,9 @@ module Berkshelf
       end
     end
 
+    attribute 'api.timeout',
+      type: String,
+      default: '30'
     attribute 'chef.chef_server_url',
       type: String,
       default: Berkshelf.chef_config.chef_server_url

data/lib/berkshelf/core_ext/file_utils.rb

@@ -2,12 +2,21 @@ require 'fileutils'
 
 module FileUtils
   class << self
-    # Override mv to avoid several bugs (Errno::EACCES in Windows, Errno::ENOENT
-    #   with relative softlinks on Linux), by forcing to copy and delete instead
+    alias_method :old_mv, :mv
+
+    # If we encounter Errno::EACCES, which seems to happen occasionally on Windows,
+    # try to copy and delete the file instead of moving it.
+    #
+    # @see https://github.com/berkshelf/berkshelf/issues/140
+    # @see http://www.ruby-forum.com/topic/1044813
     #
+    # It's also possible that we get Errno::ENOENT if we try to `mv` a relative
+    # symlink on Linux
     # @see {FileUtils::mv}
-    # @see {safe_mv}
     def mv(src, dest, options = {})
+      old_mv(src, dest, options)
+    rescue Errno::EACCES, Errno::ENOENT
+      options.delete(:force) if options.has_key?(:force)
       FileUtils.cp_r(src, dest, options)
       FileUtils.rm_rf(src)
     end

data/lib/berkshelf/file_syncer.rb

@@ -58,6 +58,11 @@ module Berkshelf
         [exclude, "#{exclude}/*"]
       end.flatten
 
+      # let glob expand the source directory in case it is an abbreviated windows
+      # user directory: C:/Users/MATTWR~1/AppData/Local/Temp
+      # so that it matches the parent of source_files
+      source = glob(source).first
+      
       source_files = glob(File.join(source, '**/*'))
       source_files = source_files.reject do |source_file|
         basename = relative_path_for(source_file, source)
@@ -95,23 +100,25 @@ module Berkshelf
         end
       end
 
-      # Remove any files in the destination that are not in the source files
-      destination_files = glob("#{destination}/**/*")
+      if options[:delete]
+        # Remove any files in the destination that are not in the source files
+        destination_files = glob("#{destination}/**/*")
 
-      # Calculate the relative paths of files so we can compare to the
-      # source.
-      relative_source_files = source_files.map do |file|
-        relative_path_for(file, source)
-      end
-      relative_destination_files = destination_files.map do |file|
-        relative_path_for(file, destination)
-      end
+        # Calculate the relative paths of files so we can compare to the
+        # source.
+        relative_source_files = source_files.map do |file|
+          relative_path_for(file, source)
+        end
+        relative_destination_files = destination_files.map do |file|
+          relative_path_for(file, destination)
+        end
 
-      # Remove any extra files that are present in the destination, but are
-      # not in the source list
-      extra_files = relative_destination_files - relative_source_files
-      extra_files.each do |file|
-        FileUtils.rm_rf(File.join(destination, file))
+        # Remove any extra files that are present in the destination, but are
+        # not in the source list
+        extra_files = relative_destination_files - relative_source_files
+        extra_files.each do |file|
+          FileUtils.rm_rf(File.join(destination, file))
+        end
       end
 
       true

data/lib/berkshelf/source.rb

@@ -17,12 +17,17 @@ module Berkshelf
                         if source == :chef_server
                           APIClient.chef_server(
                             ssl: {verify: Berkshelf::Config.instance.ssl.verify},
+                            timeout: api_timeout,
+                            open_timeout: [(api_timeout / 10), 3].max,
                             client_name: Berkshelf::Config.instance.chef.node_name,
                             server_url: Berkshelf::Config.instance.chef.chef_server_url,
                             client_key: Berkshelf::Config.instance.chef.client_key,
                           )
                         else
-                          APIClient.new(uri, ssl: {verify: Berkshelf::Config.instance.ssl.verify})
+                          APIClient.new(uri,
+                                        timeout: api_timeout,
+                                        open_timeout: [(api_timeout / 10), 3].max,
+                                        ssl: {verify: Berkshelf::Config.instance.ssl.verify})
                         end
                       end
     end
@@ -117,5 +122,10 @@ module Berkshelf
       uri == other.uri
     end
 
+    private
+
+    def api_timeout
+      Berkshelf::Config.instance.api.timeout.to_i
+    end
   end
 end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.0.0"
+  VERSION = "5.1.0"
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -390,21 +390,21 @@ describe Berkshelf::Berksfile do
     let(:raw_metadata_files) { [File::join(cached_cookbook.cookbook_name, 'metadata.rb')] }
 
     let(:destination) { '/a/destination/path' }
-    let(:excludes)    { { :exclude => raw_metadata_files + Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING } }
+    let(:options)    { { :exclude => raw_metadata_files + Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
 
     before do
       allow(Berkshelf::Installer).to receive(:new).and_return(installer)
     end
 
     it 'invokes FileSyncer with correct arguments' do
-      expect(Berkshelf::FileSyncer).to receive(:sync).with(/vendor/, destination, excludes)
+      expect(Berkshelf::FileSyncer).to receive(:sync).with(/vendor/, destination, options)
 
       subject.vendor(destination)
     end
 
     it 'excludes the top-level metadata.rb file' do
-      expect(excludes[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/recipes/metadata.rb', File::FNM_DOTMATCH) }).to be(false)
-      expect(excludes[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/metadata.rb', File::FNM_DOTMATCH) }).to be(true)
+      expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/recipes/metadata.rb', File::FNM_DOTMATCH) }).to be(false)
+      expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/metadata.rb', File::FNM_DOTMATCH) }).to be(true)
     end
   end
 

data/spec/unit/berkshelf/config_spec.rb

@@ -15,6 +15,12 @@ describe Berkshelf::Config do
     it 'should be a Berkshelf::Config' do
       expect(Berkshelf::Config.instance).to be_an_instance_of(Berkshelf::Config)
     end
+
+    context 'attributes' do
+      it 'should have a default API timeout' do
+        expect(Berkshelf::Config.instance.api.timeout).to eq('30')
+      end
+    end
   end
 
   describe '::path' do

data/spec/unit/berkshelf/core_ext/file_utils_spec.rb

@@ -2,12 +2,17 @@ require 'spec_helper'
 
 describe FileUtils do
   describe '#mv' do
-    let(:src) { double('src') }
-    let(:dest) { double('dest') }
-    let(:options) { double('options') }
+    let(:src) { 'src' }
+    let(:dest) { 'dest' }
+    let(:options) { {} }
+
+    it "uses mv by default" do
+      expect(FileUtils).to receive(:old_mv).with(src, dest, options)
+      FileUtils.mv(src, dest, options)
+    end
+
 
     it 'replaces mv with cp_r and rm_rf' do
-      allow(subject).to receive(:windows?) { true }
       expect(FileUtils).to receive(:cp_r).with(src, dest, options)
       expect(FileUtils).to receive(:rm_rf).with(src)
 

data/spec/unit/berkshelf/file_syncer_spec.rb

@@ -117,7 +117,7 @@ module Berkshelf
       context 'when the directory exists' do
         before { FileUtils.mkdir_p(destination) }
 
-        it 'deletes existing files and folders' do
+        it 'does not delete existing files and folders' do
           FileUtils.mkdir_p("#{destination}/existing_folder")
           FileUtils.mkdir_p("#{destination}/.existing_folder")
           FileUtils.touch("#{destination}/existing_file")
@@ -133,6 +133,28 @@ module Berkshelf
           expect("#{destination}/.dot_folder/file_f").to be_a_file
           expect("#{destination}/.file_g").to be_a_file
 
+          expect("#{destination}/existing_folder").to be_a_directory
+          expect("#{destination}/.existing_folder").to be_a_directory
+          expect("#{destination}/existing_file").to be_a_file
+          expect("#{destination}/.existing_file").to be_a_file
+        end
+
+        it 'optionally deletes existing files and folders' do
+          FileUtils.mkdir_p("#{destination}/existing_folder")
+          FileUtils.mkdir_p("#{destination}/.existing_folder")
+          FileUtils.touch("#{destination}/existing_file")
+          FileUtils.touch("#{destination}/.existing_file")
+
+          described_class.sync(source, destination, delete: true)
+
+          expect("#{destination}/file_a").to be_a_file
+          expect("#{destination}/file_b").to be_a_file
+          expect("#{destination}/file_c").to be_a_file
+          expect("#{destination}/folder/file_d").to be_a_file
+          expect("#{destination}/folder/file_e").to be_a_file
+          expect("#{destination}/.dot_folder/file_f").to be_a_file
+          expect("#{destination}/.file_g").to be_a_file
+
           expect("#{destination}/existing_folder").to_not be_a_directory
           expect("#{destination}/.existing_folder").to_not be_a_directory
           expect("#{destination}/existing_file").to_not be_a_file
@@ -288,7 +310,7 @@ module Berkshelf
           FileUtils.mkdir_p("#{destination}/.dot_folder")
           FileUtils.touch("#{destination}/.dot_folder/file_f")
 
-          described_class.sync(source, destination, exclude: '.dot_folder')
+          described_class.sync(source, destination, delete: true, exclude: '.dot_folder')
 
           expect("#{destination}/file_a").to be_a_file
           expect("#{destination}/file_b").to be_a_file

data/spec/unit/berkshelf/visualizer_spec.rb

@@ -2,7 +2,7 @@ require 'rspec'
 require 'spec_helper'
 
 module Berkshelf
-  describe Visualizer do
+  describe Visualizer, :not_supported_on_windows do
     describe '#to_png' do
       context 'when graphviz is not installed' do
         before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cleanroom
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +273,7 @@ files:
 - README.md
 - Rakefile
 - Thorfile
+- appveyor.yml
 - berkshelf.gemspec
 - bin/berks
 - docs/berkshelf_for_newcomers.md
@@ -468,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies