bosh-workspace 0.9.0.rc1 → 0.9.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e593085c05c3aa75cd00f1dd9d94782a3b8688
-  data.tar.gz: 55aaae5f63c4035d13650769a99605d90e678959
+  metadata.gz: 8ccd94bede78be067bb0b528afc2342f80668f00
+  data.tar.gz: 460d07d013206e4e0bece716e190107118644f89
 SHA512:
-  metadata.gz: 4880764b4fa20f940a5ed3242f8317e58dfc5faeec1f35205b1b1e2dfb2fa729413831eabf71406bf116365d7861e68ca4da3cf3370d6d010454a33777f3d54c
-  data.tar.gz: 08daea7f845dcc9f5f9c8531b1504d88c6832cc1847dcbf49204830fd9e232bc087cd3efaca31b5afac293978de9d1f94f752f4fdd77c3ccf7e050a1be8d4398
+  metadata.gz: e2360dacd6ec5f34e5a7d94aa464611acd4cf24eddf684fd6ca86c399f5c4fa0dbcc0e77bfb5ea2c0b6381a3e6bb7c1a31c10b3e6a744d577096772eb097a15b
+  data.tar.gz: bdbd537d2ec1c8577ea211aeb005fc26d6fc09fc8fbd8181e056b47411450ea75190808eea72a3c8215ce685337685f5ef53dd771a5c4de9ed962a3156912e55

data/.ruby-version

@@ -1 +1 @@
-2.0
+2.1.4

data/bosh-workspace.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_runtime_dependency "bosh_cli",  ">= 1.2682.0"
-  spec.add_runtime_dependency "bosh_common",  ">= 1.2682.0"
+  spec.add_runtime_dependency "bosh_cli",  ">= 1.2905.0"
+  spec.add_runtime_dependency "bosh_common",  ">= 1.2905.0"
   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.22.0b5"
+  spec.add_runtime_dependency "rugged", "~> 0.23.0b1"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rspec", "~> 3.1.0"

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

@@ -26,6 +26,7 @@ module Bosh::Cli::Command
 
     def prepare_release_repos
       project_deployment_releases.each do |release|
+        require_git_url_error if release.git_url.nil?
         say "Fetching release '#{release.name.make_green}' to satisfy template references"
         fetch_or_clone_repo(release.repo_dir, release.git_url)
         release.update_repo
@@ -36,6 +37,11 @@ module Bosh::Cli::Command
       end
     end
 
+    def require_git_url_error
+      say "`bosh prepare deployment' can not be used:"
+      err("`git:' is missing from `release:'".make_red)
+    end
+
     def prepare_releases
       project_deployment_releases.each do |release|
         prepare_release(release)
@@ -48,7 +54,7 @@ module Bosh::Cli::Command
         say "Skipping upload"
       else
         say "Uploading '#{release.name_version.make_green}'"
-        release_upload(release.manifest_file)
+        release_upload(release.manifest_file, release.repo_dir)
       end
     end
 

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

@@ -24,7 +24,7 @@ module Bosh::Workspace
 
       options = { credentials: require_credetials_for(url) }
       unless check_connection(repo, url, options)
-        say "Using credentials from: #{credentials_file}"
+        say "Using credentials from: #{git_credentials_file}"
         err "Invalid credentials for: #{url}"
       end
       options
@@ -45,42 +45,42 @@ module Bosh::Workspace
       Rugged::Repository.new(dir)
     end
 
-    def credentials
-      @credentials ||= Credentials.new(credentials_file)
+    def git_credentials
+      @git_credentials ||= Credentials.new(git_credentials_file)
     end
 
     def require_credetials_for(url)
-      unless File.exist? credentials_file
+      unless File.exist? git_credentials_file
         say("Authentication is required for: #{url}".make_red)
-        err("Credentials file does not exist: #{credentials_file}".make_red)
+        err("Credentials file does not exist: #{git_credentials_file}".make_red)
       end
-      unless credentials.valid?
+      unless git_credentials.valid?
         say("Validation errors:".make_red)
-        credentials.errors.each { |error| say("- #{error}") }
-        err("'#{credentials_file}' is not valid".make_red)
+        git_credentials.errors.each { |error| say("- #{error}") }
+        err("'#{git_credentials_file}' is not valid".make_red)
       end
-      if creds = credentials.find_by_url(url)
+      if creds = git_credentials.find_by_url(url)
         load_git_credentials(creds)
       else
-        say("Credential look up failed in: #{credentials_file}")
+        say("Credential look up failed in: #{git_credentials_file}")
         err("No credentials found for: #{url}".make_red)
       end
     end
 
-    def credentials_file
+    def git_credentials_file
       File.join work_dir, '.credentials.yml'
     end
 
-    def load_git_credentials(credentials)
-      case credentials.keys
+    def load_git_credentials(git_credentials)
+      case git_credentials.keys
       when %i(private_key)
         options = {
           username: 'git',
-          privatekey: temp_key_file(credentials[:private_key])
+          privatekey: temp_key_file(git_credentials[:private_key])
         }
         Rugged::Credentials::SshKey.new(options)
       when %i(username password)
-        Rugged::Credentials::UserPassword.new(credentials)
+        Rugged::Credentials::UserPassword.new(git_credentials)
       end
     end
 

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

@@ -7,8 +7,10 @@ module Bosh::Workspace
       remote_release && remote_release["versions"].include?(version.to_s)
     end
 
-    def release_upload(manifest_file)
-      release_cmd.upload(manifest_file)
+    def release_upload(manifest_file, release_dir)
+      Dir.chdir(release_dir) do
+        release_cmd.upload(manifest_file)
+      end
     end
 
     def releases_dir
@@ -26,8 +28,7 @@ module Bosh::Workspace
     private
 
     def release_cmd
-      @release_cmd ||= Bosh::Cli::Command::Release::UploadRelease.new
+      Bosh::Cli::Command::Release::UploadRelease.new
     end
   end
 end
-

data/lib/bosh/workspace/release.rb

@@ -44,11 +44,15 @@ module Bosh::Workspace
       @repo ||= Rugged::Repository.new(repo_dir)
     end
 
+    def new_style_repo
+      dir = File.join(repo_dir, "releases", @name)
+      File.directory?(dir) && !File.symlink?(dir)
+    end
+
     # transforms releases/foo-1.yml, releases/bar-2.yml to:
     # { "1" => foo-1.yml, "2" => bar-2.yml }
     def final_releases
       @final_releases ||= begin
-        new_style_repo = File.directory?(File.join(repo_dir, "releases", @name))
         releases_dir = new_style_repo ? "releases/#{@name}" : "releases"
 
         Hash[Dir[File.join(repo_dir, releases_dir, "*.yml")]

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

@@ -5,12 +5,24 @@ module Bosh::Workspace
         Membrane::SchemaParser.parse do
           [{
             "name"          => String,
-            "version"       => enum(Integer, "latest"),
+            "version"       => ReleaseVersion.new,
             optional("ref") => enum(String),
-            "git"           => String,
+            optional("git") => String,
           }]
         end.validate object
       end
     end
+
+    class ReleaseVersion < Membrane::Schemas::Base
+      def validate(object)
+        return if object == "latest"
+        begin
+          SemiSemantic::Version.parse(object.to_s)
+        rescue SemiSemantic::ParseError
+          raise Membrane::SchemaValidationError.new(
+            "Should match: latest, Semantic versioning. Given: #{object}")
+        end
+      end
+    end
   end
 end

data/lib/bosh/workspace/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Manifests
-    VERSION = "0.9.0.rc1"
+    VERSION = "0.9.0.rc2"
   end
 end

data/spec/commands/prepare_spec.rb

@@ -28,34 +28,49 @@ describe Bosh::Cli::Command::Prepare do
       let(:stemcells) { [] }
       let(:ref) { nil }
 
-      before do
-        expect(release).to receive(:update_repo)
-        expect(release).to receive(:ref).and_return(ref)
-        expect(command).to receive(:release_uploaded?)
+      context "releasewith git " do
+        before do
+          expect(release).to receive(:update_repo)
+          expect(release).to receive(:ref).and_return(ref)
+          expect(command).to receive(:release_uploaded?)
           .with(release.name, release.version).and_return(release_uploaded)
-        expect(command).to receive(:fetch_or_clone_repo)
+          expect(command).to receive(:fetch_or_clone_repo)
           .with(release.repo_dir, release.git_url)
-      end
+        end
+        context "release uploaded" do
+          let(:release_uploaded) { true }
 
-      context "release uploaded" do
-        let(:release_uploaded) { true }
+          it "does not upload the release" do
+            expect(command).to_not receive(:release_upload)
+            command.prepare
+          end
+        end
 
-        it "does not upload the release" do
-          expect(command).to_not receive(:release_upload)
-          command.prepare
+        context "release not uploaded with ref" do
+          let(:release_uploaded) { false }
+          let(:ref) { "0f910f" }
+
+          context "without release ref" do
+            it "does upload the release" do
+              expect(release).to receive(:ref).and_return(ref)
+              expect(command).to receive(:release_upload)
+                .with(release.manifest_file, release.repo_dir)
+              command.prepare
+            end
+          end
         end
       end
 
-      context "release not uploaded with ref" do
+      context "if the release git_url is not given" do
         let(:release_uploaded) { false }
-        let(:ref) { "0f910f" }
+        let(:release) do
+          instance_double("Bosh::Workspace::Release",
+                          name: "foo", version: "1", repo_dir: ".releases/foo", git_url: nil,
+                          name_version: "foo/1", manifest_file: "releases/foo-1.yml")
+        end
 
-        context "without release ref" do
-          it "does upload the release" do
-            expect(release).to receive(:ref).and_return(ref)
-            expect(command).to receive(:release_upload).with(release.manifest_file)
-            command.prepare
-          end
+        it "notifies the user that the git property must be specified" do
+          expect{ command.prepare }.to raise_error(/`git:' is missing from `release:/)
         end
       end
     end
@@ -66,7 +81,7 @@ describe Bosh::Cli::Command::Prepare do
 
       before do
         expect(command).to receive(:stemcell_uploaded?)
-          .with(stemcell.name, stemcell.version).and_return(stemcell_uploaded)
+        .with(stemcell.name, stemcell.version).and_return(stemcell_uploaded)
       end
 
       context "stemcell uploaded" do
@@ -84,7 +99,7 @@ describe Bosh::Cli::Command::Prepare do
 
         before do
           allow(stemcell).to receive(:downloaded?)
-            .and_return(stemcell_downloaded)
+          .and_return(stemcell_downloaded)
         end
 
         context "stemcell downloaded" do

data/spec/helpers/release_helper_spec.rb

@@ -26,7 +26,7 @@ describe Bosh::Workspace::ReleaseHelper do
     end
 
     let(:manifest_file) { "foo-1.yml." }
-    subject { release_helper.release_upload(manifest_file) }
+    subject { release_helper.release_upload(manifest_file, work_dir) }
 
     it "uploads release" do
       expect(release_cmd).to receive(:upload).with(manifest_file)
@@ -37,7 +37,7 @@ describe Bosh::Workspace::ReleaseHelper do
   describe "#release_uploaded?" do
     let(:releases) { { "versions" => %w(1 2 3) } }
     subject { release_helper.release_uploaded?("foo", version) }
-    before do 
+    before do
       expect(director).to receive(:get_release)
         .with("foo").and_return(releases)
     end

data/spec/schemas/releases_spec.rb

@@ -6,7 +6,7 @@ module Bosh::Workspace::Schemas
 
     subject { Releases.new.validate(releases) }
 
-    %w(name version git).each do |field_name|
+    %w(name version).each do |field_name|
       context "missing #{field_name}" do
         let(:releases) { [release.delete_if { |k| k == field_name }] }
         it { expect { subject }.to raise_error(/#{field_name}.*missing/i) }
@@ -19,13 +19,18 @@ module Bosh::Workspace::Schemas
     end
 
     context "invalid version" do
-      let(:releases) { release["version"] = "foo"; [release] }
-      it { expect { subject }.to raise_error(/version.*doesn't validate/i) }
+      let(:releases) { release["version"] = "+foo"; [release] }
+      it { expect { subject }.to raise_error(/version.*should match/i) }
     end
 
     context "optional ref" do
       let(:releases) { [release.delete_if { |k| k == "ref" }] }
       it { expect { subject }.to_not raise_error }
     end
+
+    context "optional git" do
+      let(:releases) { [release.delete_if { |k| k == "git" }] }
+      it { expect { subject }.to_not raise_error }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 
 require "rubygems"
 require "bundler"
-Bundler.setup(:default, :test)
+Bundler.setup(:default, :test, :development)
 
 $:.unshift(File.expand_path("../../lib", __FILE__))
 

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc1
+  version: 0.9.0.rc2
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2682.0
+        version: 1.2905.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2682.0
+        version: 1.2905.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2682.0
+        version: 1.2905.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2682.0
+        version: 1.2905.0
 - !ruby/object:Gem::Dependency
   name: semi_semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0b5
+        version: 0.23.0b1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0b5
+        version: 0.23.0b1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: archive-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 description: Manage your bosh workspace
@@ -171,11 +171,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -262,12 +262,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []