bosh-workspace 0.8.5 → 0.9.0.rc1

data/spec/tasks/bosh_command_runner_spec.rb

@@ -0,0 +1,39 @@
+module Bosh::Workspace::Tasks
+  describe BoshCommandRunner do
+    describe "#run" do
+      subject { BoshCommandRunner.new "example.com:25555", "foo", "bar" }
+      let(:shell) { instance_double("Bosh::Workspace::Shell") }
+
+      before do
+        allow(Bosh::Workspace::Shell).to receive(:new).and_return(shell)
+      end
+
+      def expect_bosh_command(cmd, options = {})
+        options[:output_command] = true
+        options[:env] = { "BOSH_USER" => "foo", "BOSH_PASSWORD" => "bar" }
+        cmd = "bundle exec bosh -n -t example.com:25555 #{cmd}"
+        expect(shell).to receive(:run).with(cmd, options)
+      end
+
+      it "runs" do
+        expect_bosh_command("foo")
+        subject.run "foo"
+      end
+
+      context "with deployment_file" do
+        it "runs" do
+          expect_bosh_command("-d .deployments/foo.yml foo")
+          subject.deployment_file = ".deployments/foo.yml"
+          subject.run "foo"
+        end
+      end
+
+      context "with options" do
+        it "runs" do
+          expect_bosh_command("foo", ignore_failures: true)
+          subject.run "foo", ignore_failures: true
+        end
+      end
+    end
+  end
+end

data/spec/tasks/deployment_spec.rb

@@ -0,0 +1,80 @@
+module Bosh::Workspace::Tasks
+  describe Deployment do
+    subject { Deployment.new(deployment) }
+    let(:deployment) do
+      {
+        "name" => "foo",
+        "target" => "foo:bar@example.com:25555",
+        "apply_patch" => "tmp/apply_foo_patch.yml",
+        "create_patch" => "tmp/create_foo_patch.yml",
+        "errands" => ["foo_errand", "bar_errand"]
+      }
+    end
+
+    describe 'validation' do
+      it "validates" do
+        expect { subject }.to_not raise_error
+      end
+
+      %w(name target).each do |field|
+        context "missing #{field}" do
+          before { deployment.delete field }
+          it { expect { subject }.to raise_error(/#{field}.*missing/i) }
+        end
+      end
+
+      %w(apply_patch create_patch errands).each do |field|
+        context "missing optional #{field}" do
+          before { deployment.delete field }
+          it { expect { subject }.to_not raise_error }
+        end
+      end
+
+      context "invalid name" do
+        before { deployment["name"] = "foo.yml" }
+        it { expect { subject }.to raise_error(/name.*doesn't match regexp/i) }
+      end
+    end
+
+    describe "#name" do
+      before do
+        expect(YAML).to receive(:load_file).with("deployments/foo.yml")
+          .and_return({ "name" => "foobar1" })
+      end
+
+      its(:name) { is_expected.to eq "foobar1" }
+    end
+
+    describe "target, username and password" do
+      before do
+        deployment["target"] = target if defined? target
+      end
+
+      its(:target) { is_expected.to eq "example.com:25555" }
+      its(:username) { is_expected.to eq "foo" }
+      its(:password) { is_expected.to eq "bar" }
+
+      context "default password" do
+        let(:target) { "foo@example.com" }
+        its(:target) { is_expected.to eq "example.com" }
+        its(:username) { is_expected.to eq "foo" }
+        its(:password) { is_expected.to eq "admin" }
+      end
+
+      context "default username" do
+        let(:target) { "example.com:25555" }
+        its(:target) { is_expected.to eq "example.com:25555" }
+        its(:username) { is_expected.to eq "admin" }
+        its(:password) { is_expected.to eq "admin" }
+      end
+    end
+
+    describe "properties" do
+      its(:merged_file) { is_expected.to eq ".deployments/foo.yml" }
+      its(:file_name) { is_expected.to eq "foo.yml" }
+      its(:errands) { is_expected.to eq ["foo_errand", "bar_errand"] }
+      its(:apply_patch) { is_expected.to eq "tmp/apply_foo_patch.yml" }
+      its(:create_patch) { is_expected.to eq "tmp/create_foo_patch.yml" }
+    end
+  end
+end

data/spec/tasks/workspace_task_spec.rb

@@ -0,0 +1,99 @@
+module Bosh::Workspace::Tasks
+  describe 'workspace' do
+    include_context "rake"
+
+    let(:cli) { instance_double("BoshCommandRunner") }
+    let(:deployment) do
+      methods = {
+        name: "foo-z1",
+        target: "example.com:25555",
+        username: "foo",
+        password: "bar",
+        merged_file: ".deployments/foo.yml",
+        apply_patch: "tmp/apply_foo_patch.yml",
+        create_patch: "tmp/create_foo_patch.yml",
+        errands: ["foo_errand", "bar_errand"]
+      }
+      instance_double("Deployment", methods)
+    end
+
+    before do
+      allow(YAML).to receive(:load_file).with("deployments.yml")
+        .and_return([:deployment])
+      allow(BoshCommandRunner).to receive(:new)
+        .with("example.com:25555", "foo", "bar").and_return(cli)
+      allow(Deployment).to receive(:new)
+        .with(:deployment).and_return(deployment)
+    end
+
+    def expect_bosh_command(cmd, options = {})
+      expect(cli).to receive(:run).with(cmd, options)
+    end
+
+    context "with deployments" do
+      before do
+        expect(cli).to receive(:deployment_file=)
+          .with(".deployments/foo.yml")
+      end
+
+      describe ':patch' do
+        subject { rake["workspace:patch"] }
+
+        it "runs" do
+          expect_bosh_command("apply deployment patch tmp/apply_foo_patch.yml")
+          expect_bosh_command("create deployment patch tmp/create_foo_patch.yml")
+          subject.invoke
+        end
+      end
+
+      describe ':deploy' do
+        subject { rake["workspace:deploy"] }
+        let(:already_invoked_tasks) { %w(workspace:target) }
+        let(:deploy_stdout) { "task 100" }
+
+        before do
+          expect_bosh_command("prepare deployment")
+          expect(cli).to receive(:run).with("deploy", last_number: 1)
+            .and_return(deploy_stdout)
+        end
+
+        it "runs" do
+          subject.invoke
+        end
+
+        context "with failing deploy" do
+          let(:deploy_stdout) { "Task 101 error" }
+          it "fails" do
+            expect { subject.invoke }.to raise_error SystemExit
+          end
+        end
+      end
+
+      describe ':run_errands' do
+        subject { rake["workspace:run_errands"] }
+
+        it "runs and executes errands" do
+          expect_bosh_command("run errand foo_errand")
+          expect_bosh_command("run errand bar_errand")
+          subject.invoke
+        end
+      end
+    end
+
+    describe ':clean' do
+      subject { rake["workspace:clean"] }
+
+      it "deletes all deployments" do
+        ENV["DESTROY_DEPLOYMENTS"] = "true"
+        expect_bosh_command("delete deployment foo-z1 --force", ignore_failures: true)
+        subject.invoke
+      end
+
+      it "raises error when DESTROY_DEPLOYMENTS is not set" do
+        expect { subject.invoke }.to raise_error /destroy_deployments/i
+      end
+
+      after { ENV.delete_if { |e| e =~ /DESTROY_DEPLOYMENTS/ } }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0.rc1
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -67,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: git
+  name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.22.0b5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.22.0b5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,10 +182,14 @@ files:
 - README.md
 - Rakefile
 - bosh-workspace.gemspec
+- lib/bosh/cli/commands/deployment_patch.rb
 - lib/bosh/cli/commands/prepare.rb
 - lib/bosh/cli/commands/project_deployment.rb
 - lib/bosh/workspace.rb
+- lib/bosh/workspace/credentials.rb
+- lib/bosh/workspace/deployment_patch.rb
 - lib/bosh/workspace/helpers/dns_helper.rb
+- lib/bosh/workspace/helpers/git_credentials_helper.rb
 - lib/bosh/workspace/helpers/project_deployment_helper.rb
 - lib/bosh/workspace/helpers/release_helper.rb
 - lib/bosh/workspace/helpers/spiff_helper.rb
@@ -179,8 +197,18 @@ files:
 - lib/bosh/workspace/manifest_builder.rb
 - lib/bosh/workspace/project_deployment.rb
 - lib/bosh/workspace/release.rb
+- lib/bosh/workspace/schemas/credentials.rb
+- lib/bosh/workspace/schemas/deployment_patch.rb
+- lib/bosh/workspace/schemas/project_deployment.rb
+- lib/bosh/workspace/schemas/releases.rb
+- lib/bosh/workspace/schemas/stemcells.rb
+- lib/bosh/workspace/shell.rb
 - lib/bosh/workspace/stemcell.rb
 - lib/bosh/workspace/stub_file.rb
+- lib/bosh/workspace/tasks.rb
+- lib/bosh/workspace/tasks/bosh_command_runner.rb
+- lib/bosh/workspace/tasks/deployment.rb
+- lib/bosh/workspace/tasks/workspace.rake
 - lib/bosh/workspace/version.rb
 - spec/assets/bin/spiff
 - spec/assets/dns/job-properties.yml
@@ -189,14 +217,21 @@ files:
 - spec/assets/dns/networks-no-manual.yml
 - spec/assets/dns/properties.yml
 - spec/assets/empty-manifests-repo/.keep
+- spec/assets/foo-boshrelease-repo-new-structure.zip
+- spec/assets/foo-boshrelease-repo-updated.zip
 - spec/assets/foo-boshrelease-repo.zip
+- spec/assets/foo-boshworkspace.zip
 - 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/templates/foo/bar.yml
+- spec/commands/deployment_patch_spec.rb
 - spec/commands/prepare_spec.rb
 - spec/commands/project_deployment_spec.rb
+- spec/credentials_spec.rb
+- spec/deployment_patch_spec.rb
 - spec/helpers/dns_helper_spec.rb
+- spec/helpers/git_credentials_helper_spec.rb
 - spec/helpers/project_deployment_helper_spec.rb
 - spec/helpers/release_helper_spec.rb
 - spec/helpers/spiff_helper_spec.rb
@@ -204,9 +239,19 @@ files:
 - spec/manifest_builder_spec.rb
 - spec/project_deployment_spec.rb
 - spec/release_spec.rb
+- spec/schemas/credentials_spec.rb
+- spec/schemas/deployment_patch_spec.rb
+- spec/schemas/project_deployment_spec.rb
+- spec/schemas/releases_spec.rb
+- spec/schemas/stemcells_spec.rb
+- spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/stemcell_spec.rb
 - spec/stub_file_spec.rb
+- spec/support/shared_contexts/rake.rb
+- spec/tasks/bosh_command_runner_spec.rb
+- spec/tasks/deployment_spec.rb
+- spec/tasks/workspace_task_spec.rb
 homepage: http://starkandwayne.com
 licenses:
 - MIT
@@ -222,9 +267,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -239,14 +284,21 @@ test_files:
 - spec/assets/dns/networks-no-manual.yml
 - spec/assets/dns/properties.yml
 - spec/assets/empty-manifests-repo/.keep
+- spec/assets/foo-boshrelease-repo-new-structure.zip
+- spec/assets/foo-boshrelease-repo-updated.zip
 - spec/assets/foo-boshrelease-repo.zip
+- spec/assets/foo-boshworkspace.zip
 - 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/templates/foo/bar.yml
+- spec/commands/deployment_patch_spec.rb
 - spec/commands/prepare_spec.rb
 - spec/commands/project_deployment_spec.rb
+- spec/credentials_spec.rb
+- spec/deployment_patch_spec.rb
 - spec/helpers/dns_helper_spec.rb
+- spec/helpers/git_credentials_helper_spec.rb
 - spec/helpers/project_deployment_helper_spec.rb
 - spec/helpers/release_helper_spec.rb
 - spec/helpers/spiff_helper_spec.rb
@@ -254,6 +306,16 @@ test_files:
 - spec/manifest_builder_spec.rb
 - spec/project_deployment_spec.rb
 - spec/release_spec.rb
+- spec/schemas/credentials_spec.rb
+- spec/schemas/deployment_patch_spec.rb
+- spec/schemas/project_deployment_spec.rb
+- spec/schemas/releases_spec.rb
+- spec/schemas/stemcells_spec.rb
+- spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/stemcell_spec.rb
 - spec/stub_file_spec.rb
+- spec/support/shared_contexts/rake.rb
+- spec/tasks/bosh_command_runner_spec.rb
+- spec/tasks/deployment_spec.rb
+- spec/tasks/workspace_task_spec.rb