bosh-deployer 0.0.3 → 0.0.5

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'cancun', path: '../cancun'
+gem 'bosh_cli'
 
 
 

data/Gemfile.lock

@@ -1,53 +1,114 @@
 PATH
   remote: .
   specs:
-    bosh-deployer (0.2.2)
+    bosh-deployer (0.0.4)
+      cancun
       readwritesettings
       redcard
       thor (~> 0.18)
 
-PATH
-  remote: ../cancun
+GEM
+  remote: https://rubygems.org/
   specs:
-    cancun (0.2.1)
+    aws-sdk (1.44.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+    blobstore_client (1.2710.0)
+      aws-sdk (= 1.44.0)
+      bosh_common (~> 1.2710.0)
+      fog (~> 1.14.0)
+      httpclient (= 2.4.0)
+      multi_json (~> 1.1)
+      ruby-atmos-pure (~> 1.0.5)
+    bosh-template (1.2710.0)
+      semi_semantic (~> 1.1.0)
+    bosh_cli (1.2710.0)
+      blobstore_client (~> 1.2710.0)
+      bosh-template (~> 1.2710.0)
+      bosh_common (~> 1.2710.0)
+      highline (~> 1.6.2)
+      httpclient (= 2.4.0)
+      json_pure (~> 1.7)
+      minitar (~> 0.5.4)
+      net-scp (~> 1.1.0)
+      net-ssh (>= 2.2.1)
+      net-ssh-gateway (~> 1.2.0)
+      netaddr (~> 1.5.0)
+      progressbar (~> 0.9.0)
+      terminal-table (~> 1.4.3)
+    bosh_common (1.2710.0)
+      semi_semantic (~> 1.1.0)
+    builder (3.2.2)
+    cancun (0.2.2)
       highline
       highline-color
       sourcify
-
-GEM
-  remote: https://rubygems.org/
-  specs:
     diff-lcs (1.2.5)
+    excon (0.25.3)
     file-tail (1.0.12)
       tins (~> 0.5)
+    fog (1.14.0)
+      builder
+      excon (~> 0.25.0)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5)
+      ruby-hmac
+    formatador (0.2.5)
     highline (1.6.21)
-    highline-color (0.0.2)
+    highline-color (0.0.3)
+    httpclient (2.4.0)
+    json (1.8.1)
+    json_pure (1.8.1)
+    log4r (1.1.10)
+    mime-types (2.3)
+    mini_portile (0.6.0)
+    minitar (0.5.4)
+    multi_json (1.10.1)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.1)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    netaddr (1.5.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    progressbar (0.9.2)
     rake (10.3.2)
     readwritesettings (3.0.1)
     redcard (1.1.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.4)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    ruby-atmos-pure (1.0.5)
+      log4r (>= 1.1.9)
+      ruby-hmac (>= 0.4.0)
+    ruby-hmac (0.4.0)
     ruby2ruby (2.1.2)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
     ruby_parser (3.6.2)
       sexp_processor (~> 4.1)
+    semi_semantic (1.1.0)
     sexp_processor (4.4.4)
     sourcify (0.5.0)
       file-tail (>= 1.0.5)
       ruby2ruby (>= 1.2.5)
       ruby_parser (>= 2.0.5)
       sexp_processor (>= 3.0.5)
+    terminal-table (1.4.5)
     thor (0.19.1)
     tins (0.13.2)
 
@@ -56,6 +117,6 @@ PLATFORMS
 
 DEPENDENCIES
   bosh-deployer!
-  cancun!
+  bosh_cli
   rake
   rspec

data/bosh-deployer.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "thor", "~> 0.18"
   gem.add_dependency "redcard"
   gem.add_dependency 'readwritesettings'
+  gem.add_dependency "cancun"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "cancun"
   gem.add_development_dependency "rspec"
 end

data/lib/bosh-deployer.rb

@@ -10,7 +10,3 @@ end
 require "bosh-deployer/version"
 require "bosh-deployer/stemcell"
 require "bosh-deployer/bosh_stub"
-
-# require "bosh-bootstrap/network"
-# require "bosh-bootstrap/key_pair"
-# require "bosh-bootstrap/microbosh"

data/lib/bosh-deployer/bosh_stub.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require 'cancun'
 require 'cancun/highline'
 require 'readwritesettings'
 
@@ -14,10 +15,15 @@ class Bosh::Deployer::BoshStub
   end
 
   def generate
+     if File.exists?(filename) and !agree "#{filename} already exists, do you want to overwrite it?"
+       say 'Stub generation cancelled!'
+       return
+     end
     say_bold 'Provide the following information for your bosh configuration:'
     stub = template.result(binding)
     say "Saving stub at #{filename}"
     File.open(filename, 'w') { |f| f.write(stub) }
+      
   end
 
   def static_ip_from

data/lib/bosh-deployer/cli/commands/provision_stemcells.rb

@@ -4,9 +4,11 @@ module Bosh; module Deployer; module Cli; module Commands; end; end; end; end
 
 class Bosh::Deployer::Cli::Commands::ProvisionStemcells
   attr_reader :manifest_path
-
-  def perform(manifest_path =default_manifest_path )
+  def initialize(manifest_path =default_manifest_path )
     @manifest_path = manifest_path
+  end
+
+  def perform
     puts "Downloading #{stemcell.tar_filename} from bosh-jenkins-atifacts ..."
     stemcell.download
     puts 'uploading stemcell ...'

data/lib/bosh-deployer/thor_cli.rb

@@ -10,5 +10,12 @@ module Bosh::Deployer
       deploy_cmd = Bosh::Deployer::Cli::Commands::ProvisionStemcells.new
       deploy_cmd.perform(manifest_path)
     end
+
+    desc "generate_stub <NAME>", "Generates stub for bosh or cloudfoundry"
+    def generate_stub(name)
+      cmd = Bosh::Deployer::Cli::Commands::GenerateStub.new(
+        name, 'cookbooks/ci_infrastructure_cf/files/default/stubs')
+      cmd.perform
+    end
   end
 end

data/lib/bosh-deployer/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Deployer
-    VERSION = '0.0.3'
+    VERSION = '0.0.5'
   end
 end

data/spec/bosh_stub_spec.rb

@@ -59,6 +59,9 @@ describe Bosh::Deployer::BoshStub do
     describe 'when .bootstrap/settings.yml exist' do
       before do
         `rm -rf tmp ; mkdir tmp`
+        allow(File).to receive(:exists?).and_call_original
+        allow(File).to receive(:exists?)
+          .with('~/.bootstrap/settings.yml').and_return(true)
         allow_any_instance_of(ReadWriteSettings)
           .to receive(:open).and_call_original
         allow_any_instance_of(ReadWriteSettings)
@@ -71,7 +74,7 @@ describe Bosh::Deployer::BoshStub do
         execute do
           bosh_stub.generate
         end.and_type  *args
-
+        sleep 1 #TODO: develop wait for cmd after and type
         equal_yaml('spec/fixtures/stubs/bosh.yml', 'tmp/bosh.yml')
       end
     end
@@ -92,5 +95,22 @@ describe Bosh::Deployer::BoshStub do
         equal_yaml('spec/fixtures/stubs/bosh.yml', 'tmp/bosh.yml')
       end
     end
+
+    describe 'when stub already exists' do
+      before do
+        `rm -rf tmp ; mkdir tmp`
+        `echo 'something' > tmp/bosh.yml` 
+      end
+
+      let(:args){ %w{ n } }
+
+      it 'should not change stub if user does not want to edit it' do
+        execute do
+          bosh_stub.generate
+        end.and_type  *args
+        expect(output).to include('Stub generation cancelled!')
+      end
+    end
   end
+
 end

data/spec/commands/provision_stemcells_spec.rb

@@ -2,7 +2,7 @@ require "bosh-deployer/cli/commands/provision_stemcells"
 require "bosh-deployer/stemcell"
 
 describe Bosh::Deployer::Cli::Commands::ProvisionStemcells do
-  let(:cmd) { described_class.new }
+  let(:cmd) { described_class.new(manifest_path) }
   let(:stemcell) { double.as_null_object }
 
   before do
@@ -12,7 +12,7 @@ describe Bosh::Deployer::Cli::Commands::ProvisionStemcells do
   end
 
   describe '#perform' do
-    let(:perform_provision_stemcells){ cmd.perform(manifest_path) }
+    let(:perform_provision_stemcells){ cmd.perform }
 
     describe 'when filename is provided' do
       [{
@@ -66,7 +66,6 @@ describe Bosh::Deployer::Cli::Commands::ProvisionStemcells do
       end
 
       it 'should raise error with missing arguments' do
-
       end
     end
   end

data/spec/thor_cli_spec.rb

@@ -0,0 +1,29 @@
+require 'bosh-deployer'
+require 'bosh-deployer/thor_cli'
+require 'bosh-deployer/cli/commands/generate_stub'
+require 'bosh-deployer/cli/commands/provision_stemcells'
+
+describe Bosh::Deployer::ThorCli do
+  let(:cli){ described_class.new }
+
+  describe 'generate_stub' do
+    let(:cmd){ double.as_null_object }
+
+    it 'should called generate stub with the correct commands' do
+      expect(Bosh::Deployer::Cli::Commands::GenerateStub)
+        .to receive(:new).with('bosh',anything).and_return(cmd)
+        cli.generate_stub('bosh')
+    end
+  end
+
+  describe 'provision_stemcells' do
+    let(:cmd){ double.as_null_object }
+
+    it 'should called generate stub with the correct commands' do
+      allow(Bosh::Deployer::Cli::Commands::ProvisionStemcells)
+        .to receive(:new).and_return(cmd)
+      expect(cmd).to receive(:perform)
+      cli.provision_stemcells
+    end
+  end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: bosh-deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
+  prerelease: 
 platform: ruby
 authors:
 - Alan Moran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,74 +30,84 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: readwritesettings
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cancun
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancun
+  name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ' CLI plugin for bosh to perform different deploying tasks'
+description: ! ' CLI plugin for bosh to perform different deploying tasks'
 email:
 - bonzofenix@gmail.com
 executables:
@@ -130,30 +143,32 @@ files:
 - spec/fixtures/stubs/bosh.yml
 - spec/fixtures/stubs/cloudfoundry.stub.yml
 - spec/stemcell_spec.rb
+- spec/thor_cli_spec.rb
 - stubs/bosh.yml.erb
 homepage: https://github.com/bonzofenix/bosh-deployer
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
-summary: 'bosh-deployer can: - downloads and upload stemcells specifies on a manifest
+specification_version: 3
+summary: ! 'bosh-deployer can: - downloads and upload stemcells specifies on a manifest
   pending: - deploy Bosh - deploy CF'
 test_files:
 - spec/bosh_stub_spec.rb
@@ -166,3 +181,4 @@ test_files:
 - spec/fixtures/stubs/bosh.yml
 - spec/fixtures/stubs/cloudfoundry.stub.yml
 - spec/stemcell_spec.rb
+- spec/thor_cli_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0f23d785521e58b46f24e09480694af1e7cc5a72
-  data.tar.gz: 1b8d153523965f11c94e44ea3815a19a9039f6e4
-SHA512:
-  metadata.gz: 74c62b59ad4d1e12d69738c0456bca66cae516ceda3157e017960ea4a69705f256059b1b64930f481e2931b5a7eebbc318babe30819230e87acba19b775c60c8
-  data.tar.gz: 808c6c521726d44c7f61658f54cab64fbcfd2ab35850cadb79a9147319b83fcdc7f1d51c1c0898a52f4a623c41d7312e2aacf211c55460384fdae5584dd9bd5f