bosh-workspace 0.7.0 → 0.8.0

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-# Copyright (c) 2012-2013 Stark & Wayne, LLC
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 
@@ -61,8 +62,8 @@ def in_home_dir(&block)
   FileUtils.chdir(home_file, &block)
 end
 
-def get_tmp_file_path(content)
-  tmp_file = File.open(File.join(Dir.mktmpdir, "tmp"), "w")
+def get_tmp_file_path(content, file_name="tmp")
+  tmp_file = File.open(File.join(Dir.mktmpdir, file_name), "w")
   tmp_file.write(content)
   tmp_file.close
   tmp_file.path
@@ -73,6 +74,11 @@ def asset_dir(*path)
   File.join(assets_dir, *path)
 end
 
+def asset_file(*path)
+  assets_file = File.expand_path("../assets", __FILE__)
+  IO.read(File.join(assets_file, *path))
+end
+
 def extracted_asset_dir(name, *path)
   zipped_file = asset_dir(*path)
   target_dir = File.expand_path("../../tmp/#{name}", __FILE__)

data/spec/stemcell_spec.rb

@@ -0,0 +1,28 @@
+describe Bosh::Workspace::Stemcell do
+  subject { Bosh::Workspace::Stemcell.new(stemcell, stemcells_dir) }
+  let(:stemcells_dir) { ".stemcells" }
+  let(:stemcell) { { "name" => name, "version" => version } }
+  let(:name) { "bosh-warden-boshlite-ubuntu-trusty-go_agent" }
+  let(:file_name) { "bosh-stemcell-3-warden-boshlite-ubuntu-trusty-go_agent.tgz" }
+  let(:version) { 3 }
+
+  describe "#name_version" do
+    its(:name_version) { should eq "#{name}/#{version}" }
+  end
+
+  describe "#file_name" do
+    its(:file_name) { should eq file_name }
+  end
+
+  describe "#downloaded?" do
+    before { File.should_receive(:exists?).with(/\/#{file_name}/).and_return(true) }
+    its(:downloaded?) { should eq true }
+  end
+
+  describe "attr readers" do
+    let(:file) { "#{stemcells_dir}/#{file_name}" }
+    %w(name version file).each do |attr| 
+      its(attr.to_sym) { should eq eval(attr) }
+    end
+  end
+end

data/spec/stub_file_spec.rb

@@ -0,0 +1,74 @@
+describe Bosh::Workspace::StubFile do
+  let(:project_deployment) { instance_double("Bosh::Workspace::ProjectDeployment",
+    name: "bar",
+    director_uuid: "foo-bar-uuid",
+    stemcells: stemcells,
+    releases: [ { "name" => "foo", "version" => "latest", "git" => "release_repo.git" } ],
+    templates: ["foo.yml"],
+    meta: meta,
+    merged_file: ".deployments/foo.yml")
+  }
+  let(:meta) {{ "foo" => "bar" }}
+  let(:stemcells) { [ { "name" => "foo", "version" => "2"} ] }
+  let(:path) { "foo/.stubs/bar.yml"}
+
+  let(:stub_file) { Bosh::Workspace::StubFile.new(project_deployment) }
+  subject { stub_file }
+
+  describe ".create" do
+    let(:stub_file) { instance_double("Bosh::Workspace::StubFile") }
+    subject { Bosh::Workspace::StubFile.create(path, project_deployment) }
+
+    it "calls write" do
+      Bosh::Workspace::StubFile.should_receive(:new)
+        .with(project_deployment).and_return(stub_file)
+      stub_file.should_receive(:write).with(path)
+      subject
+    end
+  end
+
+  describe "#write" do
+    it "writes yaml content" do
+      IO.should_receive(:write).with(path, /---\n/)
+      subject.write(path)
+    end
+  end
+
+  describe "#content" do
+    subject { stub_file.content }
+    its(["name"]) { should eq project_deployment.name }
+    its(["director_uuid"]) { should eq project_deployment.director_uuid }
+    its(["releases"]) { should be_a(Array) }
+    its(["meta"]) { should be_a(Hash) }
+  end
+
+  describe "#releases" do
+    it "filters disallowed keys" do
+      expect(subject.releases.first).to_not include "git" => "release_repo.git"
+      expect(subject.releases.first).to include "name" => "foo", "version" => "latest"
+    end
+  end
+
+  describe "#meta" do
+    let(:stemcell_foo) { { "name" => "foo", "version" => "2" } }
+    let(:stemcell_bar) { { "name" => "bar", "version" => "3" } }
+
+    context "1 stemcell" do
+      let(:stemcells) { [ stemcell_foo ] }
+      its(:meta) { should include "stemcell" => stemcell_foo }
+      its(:meta) { should include meta }
+    end
+
+    context "multiple stemcells" do
+      let(:stemcells) { [ stemcell_foo, stemcell_bar ] }
+      its(:meta) { should include "stemcells" => [ stemcell_foo, stemcell_bar ] }
+      its(:meta) { should include meta }
+    end
+
+    context "meta already containing stemcell" do
+      let(:meta) { { "stemcell" => stemcell_bar } }
+      let(:stemcells) { [ stemcell_foo ] }
+      its(:meta) { should include "stemcell" => stemcell_bar }
+    end
+  end
+end

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: bosh-workspace
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ruben Koster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-07-30 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.1722.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1722.0
+- !ruby/object:Gem::Dependency
+  name: bosh_common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1722.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1722.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: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -70,28 +112,28 @@ dependencies:
   name: rspec-fire
   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: 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
@@ -119,36 +161,52 @@ files:
 - .rspec
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bosh-workspace.gemspec
-- lib/bosh/cli/commands/01_make_manifest.rb
+- lib/bosh/cli/commands/prepare.rb
+- lib/bosh/cli/commands/project_deployment.rb
 - lib/bosh/workspace.rb
-- lib/bosh/workspace/deployment_manifest.rb
+- lib/bosh/workspace/helpers/dns_helper.rb
 - lib/bosh/workspace/helpers/project_deployment_helper.rb
+- lib/bosh/workspace/helpers/release_helper.rb
 - lib/bosh/workspace/helpers/spiff_helper.rb
+- lib/bosh/workspace/helpers/stemcell_helper.rb
 - lib/bosh/workspace/manifest_builder.rb
+- lib/bosh/workspace/project_deployment.rb
 - lib/bosh/workspace/release.rb
-- lib/bosh/workspace/release_manager.rb
+- lib/bosh/workspace/stemcell.rb
+- lib/bosh/workspace/stub_file.rb
 - lib/bosh/workspace/version.rb
 - spec/assets/bin/spiff
+- spec/assets/dns/job-properties.yml
+- spec/assets/dns/jobs.yml
+- spec/assets/dns/networks-manual.yml
+- spec/assets/dns/networks-no-manual.yml
+- spec/assets/dns/properties.yml
 - spec/assets/empty-manifests-repo/.keep
 - spec/assets/foo-boshrelease-repo.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/command_make_manifest_spec.rb
-- spec/deployment_manifest_spec.rb
+- spec/commands/prepare_spec.rb
+- spec/commands/project_deployment_spec.rb
+- spec/helpers/dns_helper_spec.rb
 - spec/helpers/project_deployment_helper_spec.rb
+- spec/helpers/release_helper_spec.rb
 - spec/helpers/spiff_helper_spec.rb
+- spec/helpers/stemcell_helper_spec.rb
 - spec/manifest_builder_spec.rb
-- spec/release_manager_spec.rb
+- spec/project_deployment_spec.rb
 - spec/release_spec.rb
 - spec/spec_helper.rb
+- spec/stemcell_spec.rb
+- spec/stub_file_spec.rb
 homepage: http://starkandwayne.com
 licenses:
 - MIT
@@ -159,33 +217,43 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manage your bosh workspace
 test_files:
 - spec/assets/bin/spiff
+- spec/assets/dns/job-properties.yml
+- spec/assets/dns/jobs.yml
+- spec/assets/dns/networks-manual.yml
+- spec/assets/dns/networks-no-manual.yml
+- spec/assets/dns/properties.yml
 - spec/assets/empty-manifests-repo/.keep
 - spec/assets/foo-boshrelease-repo.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/command_make_manifest_spec.rb
-- spec/deployment_manifest_spec.rb
+- spec/commands/prepare_spec.rb
+- spec/commands/project_deployment_spec.rb
+- spec/helpers/dns_helper_spec.rb
 - spec/helpers/project_deployment_helper_spec.rb
+- spec/helpers/release_helper_spec.rb
 - spec/helpers/spiff_helper_spec.rb
+- spec/helpers/stemcell_helper_spec.rb
 - spec/manifest_builder_spec.rb
-- spec/release_manager_spec.rb
+- spec/project_deployment_spec.rb
 - spec/release_spec.rb
 - spec/spec_helper.rb
+- spec/stemcell_spec.rb
+- spec/stub_file_spec.rb

data/lib/bosh/workspace/deployment_manifest.rb

@@ -1,67 +0,0 @@
-module Bosh::Manifests
-  class DeploymentManifest
-    include Bosh::Cli::Validation
-    attr_writer :director_uuid
-    attr_reader :file
-
-    def initialize(file)
-      @file = file
-      err("Deployment file does not exist: #{file}") unless File.exist? @file
-      @manifest = Psych.load(File.read(@file))
-    end
-
-    def perform_validation(options = {})
-      if @manifest.is_a?(Hash)
-        unless @manifest.has_key?("name") && @manifest["name"].is_a?(String)
-          errors << "Manifest should contain a name"
-        end
-
-        unless @manifest.has_key?("director_uuid") && @manifest["director_uuid"].is_a?(String)
-          errors << "Manifest should contain a director_uuid"
-        end
-
-        unless @manifest.has_key?("templates") && @manifest["templates"].is_a?(Array)
-          errors << "Manifest should contain templates"
-        end
-
-        unless @manifest.has_key?("releases") && @manifest["releases"].is_a?(Array)
-          errors << "Manifest should contain releases"
-        end
-
-        unless @manifest.has_key?("meta") && @manifest["meta"].is_a?(Hash)
-          errors << "Manifest should contain meta hash"
-        end
-      else
-        errors << "Manifest should be a hash"
-      end
-    end
-
-    def director_uuid
-      @director_uuid || @manifest["director_uuid"]
-    end
-
-    def merged_file
-      @merged_file ||= begin
-        path = File.join(file_dirname, "../.deployments", file_basename)
-        FileUtils.mkpath File.dirname(path)
-        File.expand_path path
-      end
-    end
-
-    %w[name templates releases meta].each do |var|
-      define_method var do
-        @manifest[var]
-      end
-    end
-
-    private
-
-    def file_basename
-      File.basename(@file)
-    end
-
-    def file_dirname
-      File.dirname(@file)
-    end
-  end
-end

data/lib/bosh/workspace/release_manager.rb

@@ -1,14 +0,0 @@
-module Bosh::Manifests
-  class ReleaseManager
-    def initialize(releases, work_dir)
-      releases_dir = File.join(work_dir, ".releases")
-      @releases = releases.map { |r| Release.new(r, releases_dir) }
-    end
-
-    def update_release_repos
-      @releases.each do |release|
-        release.checkout_current_version
-      end
-    end
-  end
-end