bosh-workspace 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d72e3aae686056ee3d786b534ab08899f9bd27
-  data.tar.gz: cbddbed1e9069bf8bd2472d7e299d48418461008
+  metadata.gz: 607445472fd952b1af30e2c82b6f3a0cb41d428d
+  data.tar.gz: f0f76de3b79dce0572d2fbec1abb7639b8371cd3
 SHA512:
-  metadata.gz: 7d9c43f7372bac130ec5ce6d76d6871437109dbfa2c6323f26d57f8856f29262c840e0a56fecb12a438f2a4ab2402bd54770f2714afab6e54c0df893dcc50156
-  data.tar.gz: fc77d521f723b6cdf85d26196d434d149a562e3f13e7f109a28773f5ad1cb852587469828edb68640d56be08ce5237cd62a74227acf458cbf28bb01a7f0e92ac
+  metadata.gz: 4b78a7da1250d9063edf88d3be266d7de2b22a028527a85ff7db45b3d5fb0addb6dbb71a8737116c3a7c242f1151462ffb0d8370bed1877be4662eaaceb5be71
+  data.tar.gz: abc262a9c39cd72eefe22ed7a73bd6bf8fb2be7d99893f8f40f926278c7018488b519c5f72a7e91de79b7844db4f4b54b2662e97bbe3410d2b65859ee7acb053

data/README.md

@@ -123,6 +123,15 @@ Example `.credentials.yml` file:
     -----END RSA PRIVATE KEY-----
 ```
 
+## Install Notes
+
+### Ubuntu
+cmake and libcurl4-openssl-dev is needed for rugged install
+
+```
+sudo apt-get install cmake libcurl4-openssl-dev
+```
+
 ## Experimental
 ### dns support
 Dns support can be enabled by adding a `domain_name` property to your deployment.

data/bosh-workspace.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "semi_semantic", "~> 1.1.0"
   spec.add_runtime_dependency "membrane", "~> 1.1.0"
   spec.add_runtime_dependency "hashdiff", "~> 0.2.1"
-  spec.add_runtime_dependency "rugged", "~> 0.23.0b1"
+  spec.add_runtime_dependency "rugged", "~> 0.23.0b3"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rspec", "~> 3.1.0"

data/lib/bosh/cli/commands/project_deployment.rb

@@ -38,7 +38,9 @@ module Bosh::Cli::Command
         build_project_deployment
       end
 
-      deployment_cmd(options).perform
+      command = deployment_cmd(options)
+      command.perform
+      @exit_code = command.exit_code
     end
 
     private

data/lib/bosh/workspace/project_deployment.rb

@@ -7,7 +7,7 @@ module Bosh::Workspace
     def initialize(file)
       @file = file
       err("Deployment file does not exist: #{file}") unless File.exist? @file
-      @manifest = YAML.load_file @file
+      @manifest = Psych.load(ERB.new(File.read(@file)).result)
     end
 
     def perform_validation(options = {})

data/lib/bosh/workspace/release.rb

@@ -90,22 +90,28 @@ module Bosh::Workspace
     # [ { version: "1", commit: ee8d52f5d, manifest: releases/foo-1.yml } ]
     def final_releases
       @final_releases ||= begin
-        final_releases = {}
+        final_releases = []
         releases_tree.walk_blobs(:preorder) do |_, entry|
           next if entry[:filemode] == 40960 # Skip symlinks
           path = File.join(releases_dir, entry[:name])
-          blame = Rugged::Blame.new(repo, path)[0]
-          time = blame[:final_signature][:time]
+          blame = Rugged::Blame.new(repo, path).reduce { |memo, hunk|
+            if memo.nil? || hunk[:final_signature][:time] > memo[:final_signature][:time]
+              hunk
+            else
+              memo
+            end
+          }
           commit_id = blame[:final_commit_id]
           manifest = blame[:orig_path]
           version = entry[:name][/#{@name}-(.+)\.yml/, 1]
-          final_releases[time] = {
-            version: version, manifest: manifest, commit: commit_id
-          }
+          if ! version.nil?
+            final_releases.push({
+              version: version, manifest: manifest, commit: commit_id
+            })
+          end
         end
 
-        final_releases.sort_by { |k, _| k }
-          .map { |a| a[1] }.reject { |f| f[:manifest][/index.yml/] }
+        final_releases.sort! { |a, b| a[:version].to_i <=> b[:version].to_i }
       end
     end
 

data/lib/bosh/workspace/schemas/stemcells.rb

@@ -16,9 +16,9 @@ module Bosh::Workspace
         return if object.is_a? Integer
         return if object.is_a? Float
         return if object == "latest"
-        return if object.to_s =~ /^\d+\.\d+$/
+        return if object.to_s =~ /^\d+(\.\d+){1,2}$/
         raise Membrane::SchemaValidationError.new(
-          "Should match: latest, version.patch or version. Given: #{object}")
+          "Should match: latest, version.patch.micropatch, version.patch or version. Given: #{object}")
       end
     end
   end

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/spec/commands/project_deployment_spec.rb

@@ -66,10 +66,12 @@ describe Bosh::Cli::Command::ProjectDeployment do
       expect(command).to receive(:project_deployment?)
         .and_return(is_project_deployment)
       expect(deployment_cmd).to receive(:perform)
+      expect(deployment_cmd).to receive(:exit_code).and_return(exit_code)
     end
 
     context "with project deployment" do
       let(:is_project_deployment) { true }
+      let(:exit_code) { 0 }
 
       it "requires project deployment" do
         expect(command).to receive(:require_project_deployment)
@@ -80,9 +82,21 @@ describe Bosh::Cli::Command::ProjectDeployment do
 
     context "with normal deployment" do
       let(:is_project_deployment) { false }
+      let(:exit_code) { 0 }
 
       it "deploys" do
         subject
+        expect(command.exit_code).to eq(0)
+      end
+    end
+
+    context "with failing deployment" do
+      let(:is_project_deployment) { false }
+      let(:exit_code) { 1 }
+
+      it "reports the exit_code correctly" do
+        subject
+        expect(command.exit_code).to eq(1)
       end
     end
   end

data/spec/project_deployment_spec.rb

@@ -1,9 +1,10 @@
 module Bosh::Workspace
   describe ProjectDeployment do
     subject { Bosh::Workspace::ProjectDeployment.new manifest_file }
-    let(:manifest_file) { get_tmp_file_path(manifest.to_yaml, file_name) }
+    let(:manifest_file) { get_tmp_file_path(ruby_code + manifest.to_yaml, file_name) }
     let(:file_name) { "foo.yml" }
     let(:manifest) { :manifest }
+    let(:ruby_code) { "<% ruby_var=42 %>" }
 
     describe ".new" do
       context "deployment file does not exist" do

data/spec/release_spec.rb

@@ -86,6 +86,44 @@ describe Bosh::Workspace::Release do
     end
   end
 
+  context "given a release with index + release v1 last touched on the same commit" do
+    let(:repo) { extracted_asset_dir("foo-bar", "foo-bar-boshrelease-repo.zip") }
+    let(:name) { "foo-bar" }
+
+    before do
+      FileUtils.rm_rf(releases_dir)
+    end
+
+    describe "#update_repo" do
+      subject do
+        Dir[File.join(releases_dir, name, "releases/foo-bar/foo-bar*.yml")].to_s
+      end
+
+      context "latest version" do
+        before { release.update_repo }
+          let(:version) { "latest" }
+          it "checks out repo" do
+          expect(subject).to match(/releases\/foo-bar\/foo-bar-2.yml/)
+        end
+      end
+    end
+
+    describe "attributes" do
+      let(:version) { "1" }
+      subject { release }
+      its(:name) { should eq name}
+      its(:git_url) { should eq repo }
+      its(:repo_dir) { should match(/\/#{name}$/) }
+      its(:manifest) { should match "releases/#{name}/#{name}-#{version}.yml$" }
+      its(:name_version) { should eq "#{name}/#{version}" }
+      its(:version) { should eq version }
+      its(:manifest_file) do
+        should match(/\/releases\/#{name}\/#{name}-#{version}.yml$/)
+      end
+    end
+  end
+
+
   context "given a release with submodule templates" do
     let(:repo) { extracted_asset_dir("supermodule", "supermodule-boshrelease-repo.zip") }
     let(:subrepo) { extracted_asset_dir("submodule-boshrelease", "submodule-boshrelease-repo.zip") }

data/spec/schemas/releases_spec.rb

@@ -24,6 +24,11 @@ module Bosh::Workspace::Schemas
       it { expect { subject }.to_not raise_error }
     end
 
+    context "semantic version" do
+      let(:releases) { release["version"] = "1.2.3"; [release] }
+      it { expect { subject }.to_not raise_error }
+    end
+
     context "invalid version" do
       let(:releases) { release["version"] = "+foo"; [release] }
       it { expect { subject }.to raise_error(/version.*should match/i) }

data/spec/schemas/stemcells_spec.rb

@@ -23,6 +23,16 @@ module Bosh::Workspace::Schemas
       it { expect { subject }.to_not raise_error }
     end
 
+    context "patch version with multiple dots" do
+      let(:stemcells) { stemcell["version"] = "1.2.3"; [stemcell] }
+      it { expect { subject }.to_not raise_error }
+    end
+
+    context "fails for versions with too many dots" do
+      let(:stemcells) { stemcell["version"] = "1.2.3.4"; [stemcell] }
+      it { expect { subject }.to raise_error(/version.*should match/i) }
+    end
+
     context "patch version float" do
       let(:stemcells) { stemcell["version"] = 2719.1; [stemcell] }
       it { expect { subject }.to_not raise_error }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0b1
+        version: 0.23.0b3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0b1
+        version: 0.23.0b3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +218,7 @@ files:
 - spec/assets/dns/networks-no-manual.yml
 - spec/assets/dns/properties.yml
 - spec/assets/empty-manifests-repo/.keep
+- spec/assets/foo-bar-boshrelease-repo.zip
 - spec/assets/foo-boshrelease-repo-new-structure.zip
 - spec/assets/foo-boshrelease-repo-subdir.zip
 - spec/assets/foo-boshrelease-repo-updated.zip
@@ -290,6 +291,7 @@ test_files:
 - spec/assets/dns/networks-no-manual.yml
 - spec/assets/dns/properties.yml
 - spec/assets/empty-manifests-repo/.keep
+- spec/assets/foo-bar-boshrelease-repo.zip
 - spec/assets/foo-boshrelease-repo-new-structure.zip
 - spec/assets/foo-boshrelease-repo-subdir.zip
 - spec/assets/foo-boshrelease-repo-updated.zip