bosh-workspace 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da3815bae98d1612dc8108666ca2a2843d301dd
-  data.tar.gz: e8592ea8c80c6dcab8c86fa502ed18b8ea390a7f
+  metadata.gz: 655a076bbeaf50fdc59837d9c103817bb85dbdf2
+  data.tar.gz: dfad167f3135ee92c600d175e465fa0f477cf83b
 SHA512:
-  metadata.gz: 0262e9881e357eab8e143a268a8115236b4ae9da9bd3d46d9ca409b0aa75f843dbc1bf7285451e227cd8056f51eea5035c31e3c4a40c52c36cb8f31804393d2a
-  data.tar.gz: a8b244be56f42052be702bb5f23d9bcc6c6963376517b0d488a1e29e14c41017b504a08c74ac412bd8fee4eedf61c8ae75802b09d38c560d3794f794b59c9d6e
+  metadata.gz: c7ab2bc5704fa7b391517397c05d3b222a309acd3977cb6a0bb63b76ab480b03c8520aeea1d5533c52bd37e06327a9f058c62d97de44fa4d0fd0894c072b8524
+  data.tar.gz: c28c6c5a73c44e44d9f440554e370d90222f3f6211ea1a662bc777d27cb7568743dde51437b40af844137cd69a13409fc9709e975e703679bd0990c5d5e27e94

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*~
 .bundle
 .config
 .yardoc
@@ -18,3 +19,5 @@ tmp
 *.generated_manifests
 *.DS_Store
 /spec/assets/manifests-repo/.releases/*
+.idea
+

data/.ruby-version

@@ -1 +1 @@
-2.1.4
+2.2.3

data/.travis.yml

@@ -3,6 +3,8 @@ cache: bundler
 sudo: false
 rvm:
   - 2.0
+  - 2.1
+  - 2.2
 before_script:
   - wget https://github.com/cloudfoundry-incubator/spiff/releases/download/v1.0.7/spiff_linux_amd64.zip -O /tmp/spiff.zip
   - unzip /tmp/spiff.zip && mkdir bin && mv spiff bin && chmod +x bin/spiff

data/Gemfile

@@ -6,6 +6,7 @@ gemspec
 group :development do
   gem "guard-rspec"
   gem "rubocop"
+  gem "pry"
 end
 
 group :test do

data/Guardfile

@@ -1,4 +1,6 @@
-guard :rspec, cmd: 'rspec', notification: false do
+# workaround for https://github.com/guard/guard-rspec/issues/348
+rspec_results = File.expand_path('rspec_guard_result')
+guard :rspec, cmd: 'bundle exec rspec --fail-fast', notification: false, results_file: rspec_results do
   watch(%r{^spec/(.+_spec)\.rb$})
   watch(%r{^lib/bosh/cli/commands/(.+)\.rb$})    { |m| "spec/commands/#{m[1]}_spec.rb" }
   watch(%r{^lib/bosh/workspace/(.+)\.rb$})    { |m| "spec/#{m[1]}_spec.rb" }

data/README.md

@@ -125,6 +125,12 @@ Example `.credentials.yml` file:
 
 ## Install Notes
 
+### OSX
+cmake isneeded and libssh2 is optionally (only needed when using cloning over ssh)
+```
+brew install cmake libssh2
+```
+
 ### Ubuntu
 cmake and libcurl4-openssl-dev is needed for rugged install
 

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.0b3"
+  spec.add_runtime_dependency "rugged", "~> 0.24.0b11"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rspec", "~> 3.3.0"

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

@@ -84,7 +84,7 @@ module Bosh::Cli::Command
       unless stemcell.downloaded?
         err "Stemcell not available offline: #{stemcell.file_name}" if offline?
         say "Downloading '#{stemcell.name_version.make_green}'"
-        stemcell_download(stemcell.file_name)
+        stemcell_download(stemcell)
       end
       say "Uploading '#{stemcell.name_version.make_green}'"
       stemcell_upload(stemcell.file)

data/lib/bosh/workspace/git_credentials_provider.rb

@@ -56,7 +56,7 @@ module Bosh::Workspace
       when %i(ssh_key)
         key_file = temp_key_file(credentials[:private_key])
         Rugged::Credentials::SshKey.new username: user, privatekey: key_file
-      when %i(plain_text)
+      when %i(plaintext)
         Rugged::Credentials::UserPassword.new(credentials)
       end
     end

data/lib/bosh/workspace/helpers/stemcell_helper.rb

@@ -1,12 +1,15 @@
+require 'httpclient'
+require 'cli/download_with_progress'
+
 module Bosh::Workspace
   module StemcellHelper
     include ProjectDeploymentHelper
 
-    def stemcell_download(stemcell_name)
+    def stemcell_download(stemcell)
       Dir.chdir(stemcells_dir) do
-        say "Downloading stemcell '#{stemcell_name}'"
+        say "Downloading stemcell '#{stemcell.name}' version '#{stemcell.version}'"
         nl
-        stemcell_cmd.download_public(stemcell_name)
+        download_stemcell_from_bosh_io(stemcell)
       end
     end
 
@@ -36,10 +39,38 @@ module Bosh::Workspace
       end
     end
 
+    def download_stemcell_from_bosh_io(stemcell)
+
+      url = "https://bosh.io/d/stemcells/#{stemcell.name}?v=#{stemcell.version}"
+
+      response = HTTPClient.new.head(url)
+
+      if response.status == 302
+        location = response.header['location'][0]
+        response2 = HTTPClient.new.head(location)
+
+        if response2.status == 200
+          size = response2.header['Content-Length'][0]
+        else
+          say("HTTP #{response2.status} : #{location}".make_red)
+          say(" - redirected from: : #{url}".make_red)
+          return
+        end
+      else
+        say("HTTP #{response.status} : #{url} (expecting 302 - redirect)".make_red)
+        return
+      end
+
+      download_with_progress = Bosh::Cli::DownloadWithProgress.new(location, size.to_i)
+      download_with_progress.perform
+    end
+
     private
 
     def stemcell_cmd
       @stemcell_cmd ||= Bosh::Cli::Command::Stemcell.new
     end
+
   end
+
 end

data/lib/bosh/workspace/project_deployment.rb

@@ -1,6 +1,7 @@
 module Bosh::Workspace
   class ProjectDeployment
     include Bosh::Cli::Validation
+    include Bosh::Exec
     attr_writer :director_uuid, :stub
     attr_reader :file
 
@@ -35,7 +36,7 @@ module Bosh::Workspace
 
     def manifest
       return @manifest unless @manifest.nil?
-      @manifest = Psych.load(ERB.new(File.read(file)).result)
+      @manifest = YAML.load(ERB.new(IO.read(file)).result)
       validate_stub! unless stub.empty?
       @manifest = recursive_merge(@manifest, stub) unless stub.empty?
       @manifest
@@ -43,8 +44,7 @@ module Bosh::Workspace
 
     def stub
       return @stub unless @stub.nil?
-      stub_file = File.expand_path(File.join(file_dirname, "../stubs", file_basename))
-      @stub = File.exist?(stub_file) ? Psych.load(File.read(stub_file)) : {}
+      @stub = stub_file ? load_stub : {}
     end
 
     %w[name templates releases stemcells meta domain_name].each do |var|
@@ -55,14 +55,46 @@ module Bosh::Workspace
 
     private
 
+    def stubs_dir
+      File.expand_path(File.join(file_dirname, "../stubs"))
+    end
+
+    def stub_file
+      Dir[File.join(stubs_dir, "#{file_basename('.*')}*")].first
+    end
+
+    def executable_stub?
+      File.executable?(stub_file)
+    end
+
+    def load_stub
+      begin
+        YAML.load(executable_stub? ? execute_stub! : IO.read(stub_file))
+      rescue Psych::SyntaxError => e
+        say "Error loading stub file for deployment #{file} due to invalid YAML"
+        err "error: #{e.message}"
+      end
+    end
+
+    def execute_stub!
+      sh(stub_file, yield: :on_false) do |result|
+        execute_stub_failed!(result.command, result.output) if result.failed?
+      end.output
+    end
+
+    def execute_stub_failed!(stub, output)
+      say("An error occured while executing stub file: #{stub}")
+      err("error: '#{output}'")
+    end
+
     def validate_stub!
       return unless stub.keys.any? { |k| !STUB_WHITELIST.include?(k) }
       offending_keys = stub.keys - STUB_WHITELIST
       err "Key: '#{offending_keys.first}' not allowed in stub file"
     end
 
-    def file_basename
-      File.basename(@file)
+    def file_basename(filter = '')
+      File.basename(@file, filter)
     end
 
     def file_dirname

data/lib/bosh/workspace/release.rb

@@ -76,11 +76,11 @@ module Bosh::Workspace
       repo_exists? ? open_repo : init_repo
     end
 
-    def fetch_repo(repo = repo)
+    def fetch_repo(_repo = repo)
       return if offline?
-      repo.fetch('origin', REFSPEC, credentials: @credentials_callback)
-      commit = repo.references['refs/remotes/origin/HEAD'].resolve.target_id
-      update_repo_with_ref(repo, commit)
+      _repo.fetch('origin', REFSPEC, credentials: @credentials_callback)
+      commit = _repo.references['refs/remotes/origin/HEAD'].resolve.target_id
+      update_repo_with_ref(_repo, commit)
     end
 
     def repo_exists?(dir = @repo_dir)

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

@@ -17,6 +17,7 @@ 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+$/
         return if object.to_s =~ /^\d+(\.\d+){1,2}$/
         raise Membrane::SchemaValidationError.new(
           "Should match: latest, version.patch.micropatch, version.patch or version. Given: #{object}")

data/lib/bosh/workspace/version.rb

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

data/spec/assets/manifests-repo/deployments/foobar.yml

@@ -0,0 +1,4 @@
+name: foobar
+templates:
+  - foo/bar.yml
+meta: {}

data/spec/assets/manifests-repo/stubs/foobar.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo 'director_uuid: bar-uuid'
+echo 'name: foobar'
+echo "meta: { 'foo': 'foobar', 'bar': 'foo' }"

data/spec/commands/prepare_spec.rb

@@ -139,7 +139,7 @@ describe Bosh::Cli::Command::Prepare do
           let(:stemcell_downloaded) { false }
 
           it "downloads and uploads the stemcell" do
-            expect(command).to receive(:stemcell_download).with(stemcell.file_name)
+            expect(command).to receive(:stemcell_download).with(stemcell)
             expect(command).to receive(:stemcell_upload).with(stemcell.file)
             command.prepare
           end

data/spec/git_credentials_provider_spec.rb

@@ -8,7 +8,7 @@ module Bosh::Workspace
     let(:url) { 'http://foo.com/bar.git' }
     let(:user) { nil }
     let(:result) { nil }
-    let(:allowed_types) { [:plain_text] }
+    let(:allowed_types) { [:plaintext] }
     let(:credentials) do
       instance_double "Bosh::Workspace::Credentials",
                       :valid? => valid, url_protocols: url_protocols
@@ -38,7 +38,7 @@ module Bosh::Workspace
 
       context "with username/password" do
         let(:result) { { username: user, password: 'barpw' } }
-        let(:allowed_types) { [:plain_text] }
+        let(:allowed_types) { [:plaintext] }
 
         it 'returns Rugged user password credentials' do
           expect(Rugged::Credentials::UserPassword).to receive(:new) do |args|

data/spec/helpers/stemcell_helper_spec.rb

@@ -23,12 +23,13 @@ describe Bosh::Workspace::StemcellHelper do
     end
 
     describe "#stemcell_download" do
-      let(:name) { "foo" }
-      subject { stemcell_helper.stemcell_download(name) }
+      let(:stemcell) { instance_double("Bosh::Workspace::Stemcell", :name => "foo", :version => "1") }
+
+      subject { stemcell_helper.stemcell_download(stemcell) }
 
       it "downloads stemcell" do
         expect(Dir).to receive(:chdir).and_yield
-        expect(stemcell_cmd).to receive(:download_public).with(name)
+        expect(stemcell_helper).to receive(:download_stemcell_from_bosh_io).with(stemcell)
         subject
       end
     end

data/spec/project_deployment_spec.rb

@@ -1,11 +1,10 @@
 module Bosh::Workspace
   describe ProjectDeployment do
     subject { Bosh::Workspace::ProjectDeployment.new manifest_file }
-    let(:manifest_content) { ruby_code + manifest.to_yaml }
+    let(:manifest_content) { manifest.to_yaml }
     let(:manifest_file) { get_tmp_file_path(manifest_content, 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
@@ -17,13 +16,19 @@ module Bosh::Workspace
     end
 
     describe '#manifest' do
-      let(:stub_file) { /stubs\/#{file_name}/ }
-      before do
-        allow(File).to receive(:exist?).with(manifest_file).and_return(true)
-        allow(File).to receive(:read).with(manifest_file).and_return(manifest_content)
-      end
-
       context 'with stub file' do
+        let!(:stub_file) do
+          path = "../../stubs/#{stub_filename}"
+          File.expand_path(path, manifest_file).tap do |file|
+            FileUtils.mkdir_p File.dirname(file)
+            IO.write(file, stub_content)
+          end
+        end
+
+	after { FileUtils.rm(stub_file) }
+
+        let(:stub_filename) { File.basename(manifest_file) }
+
         let(:manifest) { { 'director_uuid' => 'DIRECTOR_UUID' } }
         let(:stub_content) do
           {
@@ -33,11 +38,6 @@ module Bosh::Workspace
           }.to_yaml
         end
 
-        before do
-          allow(File).to receive(:exist?).with(stub_file).and_return(true)
-          allow(File).to receive(:read).with(stub_file).and_return(stub_content)
-        end
-
         it 'merges stub with manifest' do
           expect(subject.manifest['director_uuid']).to eq('foo-uuid')
         end
@@ -51,13 +51,53 @@ module Bosh::Workspace
         end
       end
 
-      context 'without stub file' do
-        let(:manifest) { { 'director_uuid' => 'litmus' } }
+      context 'with executable stub file' do
+        let(:stub_file) { asset_dir("manifests-repo/stubs/foobar.sh") }
+        let(:manifest_file) { asset_dir("manifests-repo/deployments/foobar.yml") }
+        let(:manifest) do
+          {
+            'name' => 'NAME',
+            'director_uuid' => 'DIRECTOR_UUID',
+            'meta' =>  { 'foo' => 'bar', 'bar' => 'foo' }
+          }
+        end
 
-        before do
-          allow(File).to receive(:exist?).with(stub_file).and_return(false)
+        it 'merges stub output with manifest' do
+          expect(subject.manifest['name']).to eq('foobar')
+          expect(subject.manifest['director_uuid']).to eq('bar-uuid')
+          expect(subject.manifest['meta']).to eq({ 'foo' => 'foobar', 'bar' => 'foo' })
         end
 
+
+        context 'which are invalid' do
+          let(:result) { Bosh::Exec::Result.new('foo.sh', 'foo: error:', exit_code) }
+          
+          before do
+            expect(subject).to receive(:sh).and_yield(result).and_return(result)
+          end
+
+          context 'non valid yaml returned' do
+            let(:exit_code) { 0 }
+            
+            it 'raises an error' do 
+              expect{ subject.manifest }.to raise_error /mapping values are not allowed/
+            end
+          end
+
+          context 'failure during execution' do
+            let(:exit_code) { 1 }
+            
+            it 'raises an error' do 
+              expect{ subject.manifest }.to raise_error /foo: error/
+            end
+          end
+        end
+      end
+
+      context 'without stub file' do
+        let(:file_name) { 'bar.yml' }
+        let(:manifest) { { 'director_uuid' => 'litmus' } }
+
         it 'reads manifest without errors' do
           expect(subject.manifest['director_uuid']).to eq('litmus')
         end
@@ -68,7 +108,7 @@ module Bosh::Workspace
       context "valid" do
         it "validates" do
           allow_any_instance_of(Schemas::ProjectDeployment)
-            .to receive(:validate).with(manifest)
+          .to receive(:validate).with(manifest)
           expect(subject).to be_valid
         end
       end
@@ -76,8 +116,8 @@ module Bosh::Workspace
       context "invalid" do
         it "has errors" do
           allow_any_instance_of(Schemas::ProjectDeployment)
-            .to receive(:validate).with(manifest)
-            .and_raise(Membrane::SchemaValidationError.new("foo"))
+          .to receive(:validate).with(manifest)
+          .and_raise(Membrane::SchemaValidationError.new("foo"))
           expect(subject).to_not be_valid
           expect(subject.errors).to include "foo"
         end
@@ -91,18 +131,18 @@ module Bosh::Workspace
 
     describe "attr readers" do
       let(:manifest) { {
-          "name" => :name,
-          "director_uuid" => :director_uuid,
-          "templates" => :templates,
-          "releases" => :releases,
-          "stemcells" => :stemcells,
-          "meta" => :meta,
-          "domain_name" => :domain_name,
-        } }
+                         "name" => :name,
+                         "director_uuid" => :director_uuid,
+                         "templates" => :templates,
+                         "releases" => :releases,
+                         "stemcells" => :stemcells,
+                         "meta" => :meta,
+                         "domain_name" => :domain_name,
+      } }
 
       let(:director_uuid) { uuid }
       %w(name director_uuid templates releases stemcells meta domain_name)
-        .each do |attr|
+      .each do |attr|
         its(attr.to_sym) { should eq attr.to_sym }
       end
     end

data/spec/schemas/stemcells_spec.rb

@@ -38,6 +38,11 @@ module Bosh::Workspace::Schemas
       it { expect { subject }.to_not raise_error }
     end
 
+    context "version string with all digetes without dots" do
+      let(:stemcells) { stemcell["version"] = '0000'; [stemcell] }
+      it { expect { subject }.to_not raise_error }
+    end
+
     context "invalid version" do
       let(:stemcells) { stemcell["version"] = "foo"; [stemcell] }
       it { expect { subject }.to raise_error(/version.*should match/i) }

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ require "rspec/its"
 require "tmpdir"
 require "archive/zip"
 
+require "pry"
+
 # bosh_cli
 require "cli"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-22 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.0b3
+        version: 0.24.0b11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0b3
+        version: 0.24.0b11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,9 @@ files:
 - spec/assets/manifests-repo/.manifests/foo.yml
 - spec/assets/manifests-repo/deployments/bar.yml
 - 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/templates/foo/bar.yml
 - spec/assets/submodule-boshrelease-repo.zip
 - spec/assets/supermodule-boshrelease-repo.zip
@@ -286,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Manage your bosh workspace
@@ -308,7 +310,9 @@ test_files:
 - spec/assets/manifests-repo/.manifests/foo.yml
 - spec/assets/manifests-repo/deployments/bar.yml
 - 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/templates/foo/bar.yml
 - spec/assets/submodule-boshrelease-repo.zip
 - spec/assets/supermodule-boshrelease-repo.zip