bosh-workspace 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 655a076bbeaf50fdc59837d9c103817bb85dbdf2
-  data.tar.gz: dfad167f3135ee92c600d175e465fa0f477cf83b
+  metadata.gz: 2a436bec65906d24adb7c0bafc96e21e6df833b4
+  data.tar.gz: 11818e982632c6757381382c450ecccb75e48602
 SHA512:
-  metadata.gz: c7ab2bc5704fa7b391517397c05d3b222a309acd3977cb6a0bb63b76ab480b03c8520aeea1d5533c52bd37e06327a9f058c62d97de44fa4d0fd0894c072b8524
-  data.tar.gz: c28c6c5a73c44e44d9f440554e370d90222f3f6211ea1a662bc777d27cb7568743dde51437b40af844137cd69a13409fc9709e975e703679bd0990c5d5e27e94
+  metadata.gz: 822956b6fb582d1de0f8e5ce43a1e80d3e1a5e77e48aae1eac8fc186aec5ef33495e9b96cc3f7a0295b5977cfacb933a4d171d237caf046f86bec2d05ab608ac
+  data.tar.gz: 152ea4addf1d2f4f040f2ac3ba56cfccb89393a6f2e92713cbe7b84a576c9ee28f2e9aa0da5704c8cb7c5a68a371b1f9468b2b9b48b5f201cf5944d02244686d

data/README.md

@@ -128,14 +128,14 @@ Example `.credentials.yml` file:
 ### OSX
 cmake isneeded and libssh2 is optionally (only needed when using cloning over ssh)
 ```
-brew install cmake libssh2
+brew install cmake libssh2 pkg-config
 ```
 
 ### Ubuntu
 cmake and libcurl4-openssl-dev is needed for rugged install
 
 ```
-sudo apt-get install cmake libcurl4-openssl-dev
+sudo apt-get install cmake libcurl4-openssl-dev libssh2-1-dev
 ```
 
 ## Experimental

data/lib/bosh/workspace/project_deployment.rb

@@ -60,7 +60,9 @@ module Bosh::Workspace
     end
 
     def stub_file
-      Dir[File.join(stubs_dir, "#{file_basename('.*')}*")].first
+      [file_basename, file_basename('.*')].map do |file|
+        Dir[File.join(stubs_dir, file)]
+      end.flatten.compact.first
     end
 
     def executable_stub?

data/lib/bosh/workspace/rspec/shared_workspace_examples.rb

@@ -8,14 +8,14 @@ desc = "behaves as bosh-workspace deployment"
 RSpec.shared_examples desc do |deployment_file, result_file, stub_file|
   let(:workdir) { File.expand_path(File.join(deployment_file, '../..')) }
   let(:stub) do
-    result = {} unless File.exist?(stub_file)
-    result ||= YAML.load_file(stub_file) || {}
+    return nil unless File.exist?(stub_file)
+    result = YAML.load_file(stub_file) || {}
     result.merge({'director_uuid' => '00000000-0000-0000-0000-000000000000'})
   end
 
   subject do
     Bosh::Workspace::ProjectDeployment.new(deployment_file).tap do |d|
-      d.stub = stub
+      d.stub = stub if stub
       d.validate
     end
   end

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.7"
+    VERSION = "0.9.8"
   end
 end

data/spec/integration/shared_workspace_examples_spec.rb

@@ -2,6 +2,7 @@ require 'bosh/workspace/rspec'
 
 describe "rspec shared bosh-workspace example" do
   deployment = {
+    'director_uuid' => 'e4802655-2dfe-459f-8344-1e3ea56b3feb',
     'name' => 'foo',
     'releases' => [],
     'stemcells' => [],
@@ -18,14 +19,6 @@ describe "rspec shared bosh-workspace example" do
     'releases' => '(( merge ))',
     'jobs' => []
   }
-  stub = { 'name' => 'bar' }
-
-  result = {
-    'director_uuid' => '00000000-0000-0000-0000-000000000000',
-    'name' => 'bar',
-    'releases' => [],
-    'jobs' => []
-  }
 
   deployment_file = get_tmp_yml_file_path(deployment).tap do |d|
     templates_path = File.expand_path('../../templates', d)
@@ -36,10 +29,39 @@ describe "rspec shared bosh-workspace example" do
     )
   end
 
-  include_examples(
-    "behaves as bosh-workspace deployment",
-    deployment_file,
-    get_tmp_yml_file_path(result),
-    get_tmp_yml_file_path(stub)
-  )
+  context "given a stub file" do
+    stub = { 'name' => 'bar' }
+
+    result = {
+      'director_uuid' => '00000000-0000-0000-0000-000000000000',
+      'name' => 'bar',
+      'releases' => [],
+      'jobs' => []
+    }
+
+    include_examples(
+      "behaves as bosh-workspace deployment",
+      deployment_file,
+      get_tmp_yml_file_path(result),
+      get_tmp_yml_file_path(stub)
+    )
+  end
+
+  context "when stub file is absent" do
+    non_existent_stub = File.join(Dir.mktmpdir, 'foobar')
+
+    result = {
+      'director_uuid' => 'e4802655-2dfe-459f-8344-1e3ea56b3feb',
+      'name' => 'foo',
+      'releases' => [],
+      'jobs' => []
+    }
+
+    include_examples(
+      "behaves as bosh-workspace deployment",
+      deployment_file,
+      get_tmp_yml_file_path(result),
+      non_existent_stub
+    )
+  end
 end

data/spec/release_spec.rb

@@ -451,7 +451,6 @@ module Bosh::Workspace
     end
 
     context "correct checkout behavior:" do
-      let(:repo) { extracted_asset_dir("foo", "foo-boshrelease-repo.zip") }
       let(:release_data) { { "name" => name, "version" => version,
                              "git" => repo, "ref" => :fooref } }
       let(:repo) { 'foo/bar' }
@@ -472,6 +471,7 @@ module Bosh::Workspace
             { 'refs/remotes/origin/HEAD' =>
               double(resolve: double(target_id: :oid)) }
           end
+          allow(subject).to receive(:repo_exists?).and_return(true)
         end
 
         it "calls checkout_tree and checkout" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -233,7 +233,7 @@ files:
 - spec/assets/manifests-repo/deployments/foo.yml
 - spec/assets/manifests-repo/deployments/foobar.yml
 - spec/assets/manifests-repo/stubs/foo.yml
-- spec/assets/manifests-repo/stubs/foobar.sh
+- spec/assets/manifests-repo/stubs/foobar
 - spec/assets/manifests-repo/templates/foo/bar.yml
 - spec/assets/submodule-boshrelease-repo.zip
 - spec/assets/supermodule-boshrelease-repo.zip
@@ -312,7 +312,7 @@ test_files:
 - spec/assets/manifests-repo/deployments/foo.yml
 - spec/assets/manifests-repo/deployments/foobar.yml
 - spec/assets/manifests-repo/stubs/foo.yml
-- spec/assets/manifests-repo/stubs/foobar.sh
+- spec/assets/manifests-repo/stubs/foobar
 - spec/assets/manifests-repo/templates/foo/bar.yml
 - spec/assets/submodule-boshrelease-repo.zip
 - spec/assets/supermodule-boshrelease-repo.zip