bosh-deployer 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    bosh-deployer (0.0.6)
+    bosh-deployer (0.0.7)
       cancun
       readwritesettings
+      recursive-open-struct
       redcard
       thor (~> 0.18)
 
@@ -13,19 +14,19 @@ GEM
     aws-sdk (1.44.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    blobstore_client (1.2710.0)
+    blobstore_client (1.2719.0)
       aws-sdk (= 1.44.0)
-      bosh_common (~> 1.2710.0)
-      fog (~> 1.14.0)
+      bosh_common (~> 1.2719.0)
+      fog (~> 1.23.0)
       httpclient (= 2.4.0)
       multi_json (~> 1.1)
       ruby-atmos-pure (~> 1.0.5)
-    bosh-template (1.2710.0)
+    bosh-template (1.2719.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)
+    bosh_cli (1.2719.0)
+      blobstore_client (~> 1.2719.0)
+      bosh-template (~> 1.2719.0)
+      bosh_common (~> 1.2719.0)
       highline (~> 1.6.2)
       httpclient (= 2.4.0)
       json_pure (~> 1.7)
@@ -36,7 +37,7 @@ GEM
       netaddr (~> 1.5.0)
       progressbar (~> 0.9.0)
       terminal-table (~> 1.4.3)
-    bosh_common (1.2710.0)
+    bosh_common (1.2719.0)
       semi_semantic (~> 1.1.0)
     builder (3.2.2)
     cancun (0.2.2)
@@ -44,23 +45,38 @@ GEM
       highline-color
       sourcify
     diff-lcs (1.2.5)
-    excon (0.25.3)
-    file-tail (1.0.12)
-      tins (~> 0.5)
-    fog (1.14.0)
+    excon (0.39.6)
+    file-tail (1.1.0)
+      tins (~> 1.0)
+    fog (1.23.0)
+      fog-brightbox
+      fog-core (~> 1.23)
+      fog-json
+      fog-softlayer
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-brightbox (0.5.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto
+    fog-core (1.24.0)
       builder
-      excon (~> 0.25.0)
-      formatador (~> 0.2.0)
+      excon (~> 0.38)
+      formatador (~> 0.2)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
+    fog-softlayer (0.3.18)
+      fog-core
+      fog-json
     formatador (0.2.5)
     highline (1.6.21)
-    highline-color (0.0.3)
+    highline-color (0.0.5)
     httpclient (2.4.0)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
     json (1.8.1)
     json_pure (1.8.1)
     log4r (1.1.10)
@@ -79,6 +95,7 @@ GEM
     progressbar (0.9.2)
     rake (10.3.2)
     readwritesettings (3.0.1)
+    recursive-open-struct (0.5.0)
     redcard (1.1.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
@@ -86,20 +103,20 @@ GEM
       rspec-mocks (~> 3.1.0)
     rspec-core (3.1.4)
       rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.1)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.1)
+    rspec-mocks (3.1.2)
       rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
+    rspec-support (3.1.1)
     ruby-atmos-pure (1.0.5)
       log4r (>= 1.1.9)
       ruby-hmac (>= 0.4.0)
     ruby-hmac (0.4.0)
-    ruby2ruby (2.1.2)
+    ruby2ruby (2.1.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.6.2)
+    ruby_parser (3.6.3)
       sexp_processor (~> 4.1)
     semi_semantic (1.1.0)
     sexp_processor (4.4.4)
@@ -110,7 +127,7 @@ GEM
       sexp_processor (>= 3.0.5)
     terminal-table (1.4.5)
     thor (0.19.1)
-    tins (0.13.2)
+    tins (1.3.3)
 
 PLATFORMS
   ruby

data/bosh-deployer.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "redcard"
   gem.add_dependency 'readwritesettings'
   gem.add_dependency "cancun"
+  gem.add_dependency "recursive-open-struct"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
 end

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

@@ -20,8 +20,8 @@ module Bosh::Cli::Command
       Bosh::Deployer::Cli::Commands::ProvisionStemcells.new.perform
     end
 
-    usage "generate stubs for bosh or cf"
-    desc "Creates stub file"
+    usage "deployer generate stub"
+    desc "Creates stub file to be compile with Spiff."
     def generate_stub(name, path=nil)
       require "bosh-deployer/cli/commands/generate_stub"
       Bosh::Deployer::Cli::Commands::GenerateStub.new(name,path).perform

data/lib/bosh-deployer/bosh_settings.rb

@@ -0,0 +1,78 @@
+require 'bosh-deployer/microbosh_settings'
+
+module Bosh::Deployer::BoshSettings
+  def microbosh
+    @microbosh ||= Bosh::Deployer::MicroboshSettings.load
+  end
+
+  def default_key_name
+    @default_key_name ||= ask('Key name:') do |q|
+      q.default = 'firstbosh'
+    end
+  end
+
+  def private_key
+    @private_key ||= ask('Private key:') do |q|
+      q.default = '~/.microbosh/ssh/firstbosh.pem'
+    end
+  end
+
+  def static_ip_from
+    @static_ip_from ||= ask 'Intial available static ip for deployment:'
+  end
+
+  def static_ip_to
+    @static_ip_to ||= ask 'Last available static ip for deployment:'
+  end
+
+  def openstack_auth_url
+    @openstack_auth_url ||= ask('Openstack auth url:') do |q|
+      q.default = microbosh.provider.credentials.openstack_auth_url.gsub('/tokens', '') if microbosh
+    end
+  end
+
+  def openstack_username
+    @openstack_username ||= ask('Openstack username:') do |q|
+      q.default =  microbosh.provider.credentials.openstack_username if microbosh
+    end
+  end
+
+  def openstack_api_key
+    @openstack_api_key ||= ask('Openstack api key:') do |q|
+      q.default =  microbosh.provider.credentials.openstack_api_key if microbosh
+    end
+  end
+
+  def openstack_tenant
+    @openstack_tenant ||= ask('Openstack tenant:') do |q|
+      q.default =  microbosh.provider.credentials.openstack_tenant if microbosh
+    end
+  end
+
+  def recursor_ip
+    @recursor_ip ||= ask('Recursor ip or host:') do |q|
+      q.default = microbosh.address.ip if microbosh
+    end
+  end
+
+  def subnet_id
+    @subnet_id ||= ask('Subnet ID where it will be deployed:') do |q|
+      q.default = microbosh.address.subnet_id if microbosh
+    end
+  end
+
+  def gateway
+    @gateway ||= ask('Gateway IP:') do |q|
+      #UGLY REPLACE ME WITH A REGEX
+      q.default = (static_ip_from.split('.')[0..-2] + ['1']).join('.')
+    end
+  end
+
+  def range
+    @range ||= ask('Ip Range where it will be deployed:') do |q|
+      #UGLY REPLACE ME WITH A REGEX
+      q.default = (static_ip_from.split('.')[0..-2] + ['0']).join('.') + '/24'
+    end
+  end
+
+end

data/lib/bosh-deployer/bosh_stub.rb

@@ -1,111 +1,12 @@
-require 'erb'
-require 'cancun'
-require 'cancun/highline'
-require 'readwritesettings'
+require 'bosh-deployer/stub'
+require 'bosh-deployer/bosh_settings'
 
 module Bosh; module Deployer; end ;end
 
-class Bosh::Deployer::BoshStub
-  include ::Cancun::Highline
-  attr_reader :filename
+class Bosh::Deployer::BoshStub < Bosh::Deployer::Stub
+  include Bosh::Deployer::BoshSettings
 
-  def initialize(path = '~/.bosh-deployer/stubs')
-    path = path[0..-2] if path[-1] == '/'
-    @filename = "#{path}/bosh.yml"
-  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
-    @static_ip_from ||= ask 'Intial available static ip for deploying bosh:'
-  end
-
-  def static_ip_to
-    @static_ip_to ||= ask 'Last available static ip for deploying bosh:'
-  end
-
-
-  def openstack_auth_url
-    @openstack_auth_url ||= ask('Openstack auth url:') do |q|
-      q.default =  microbosh.provider.credentials.openstack_auth_url.gsub('/tokens', '') if microbosh
-    end
-  end
-
-  def openstack_username
-    @openstack_username ||= ask('Openstack username:') do |q|
-      q.default =  microbosh.provider.credentials.openstack_username if microbosh
-    end
-  end
-
-  def openstack_api_key
-    @openstack_api_key ||= ask('Openstack api key:') do |q|
-      q.default =  microbosh.provider.credentials.openstack_api_key if microbosh
-    end
-  end
-
-  def openstack_tenant
-    @openstack_tenant ||= ask('Openstack tenant:') do |q|
-      q.default =  microbosh.provider.credentials.openstack_tenant if microbosh
-    end
-  end
-
-  def recursor_ip
-    @recursor_ip ||= ask('Recursor ip or host:') do |q|
-      q.default = microbosh.address.ip if microbosh
-    end
-  end
-
-  def subnet_id
-    @subnet_id ||= ask('Subnet ID where bosh will be deployed:') do |q|
-      q.default = microbosh.address.subnet_id if microbosh
-    end
-  end
-
-  def gateway
-    @gateway ||= ask('Gateway IP for bosh:') do |q|
-      #UGLY REPLACE ME WITH A REGEX
-      q.default = (static_ip_from.split('.')[0..-2] + ['1']).join('.')
-    end
-  end
-
-  def range
-    @range ||= ask('Gateway IP for bosh:') do |q|
-      #UGLY REPLACE ME WITH A REGEX
-      q.default = (static_ip_from.split('.')[0..-2] + ['0']).join('.') + '/24'
-    end
-  end
-
-  def default_key_name
-    @default_key_name ||= ask('Key name:') do |q|
-      q.default = 'firstbosh'
-    end
-  end
-
-  def private_key
-    @private_key ||= ask('Private key:') do |q|
-      q.default = '~/.microbosh/ssh/firstbosh.pem'
-    end
-  end
-
-  protected
-
-  def template
-    @template ||= ERB.new( File.read(File.expand_path('../../../stubs/bosh.yml.erb', __FILE__)))
-  end
-
-  def microbosh
-    if File.exists?('~/.bootstrap/settings.yml')
-      @microbosh ||= ReadWriteSettings.new('~/.bootstrap/settings.yml')
-    end
+  def name
+    'bosh'
   end
 end

data/lib/bosh-deployer/cf_stub.rb

@@ -0,0 +1,16 @@
+require 'bosh-deployer/stub'
+require 'bosh-deployer/bosh_settings'
+
+module Bosh; module Deployer; end ;end
+
+class Bosh::Deployer::CFStub < Bosh::Deployer::Stub
+  include Bosh::Deployer::BoshSettings
+
+  def name
+    'cloudfoundry'
+  end
+
+  def floating_static_ip
+    @floating_static_ip ||= ask('Available floating ip for cf:')
+  end
+end

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

@@ -15,6 +15,11 @@ class Bosh::Deployer::Cli::Commands::GenerateStub
 
   protected
   def stub
-    Bosh::Deployer::BoshStub.new(path) if name == 'bosh'
+    case name
+      when 'bosh'
+        Bosh::Deployer::BoshStub.new(path)
+      when 'cf'
+        Bosh::Deployer::CFStub.new(path)
+    end
   end
 end

data/lib/bosh-deployer/microbosh_settings.rb

@@ -0,0 +1,22 @@
+require 'yaml'
+require 'recursive-open-struct'
+
+class Bosh::Deployer::MicroboshSettings < RecursiveOpenStruct
+  attr_reader :filepath
+
+  def initialize(h=nil, args={})
+    if h && h.is_a?(String)
+      @filepath ||= h
+      super(YAML.load_file(filepath)) if File.exists?(filepath)
+    else
+      @filepath ||= '~/.bootstrap/settings.yml'
+      super(h, args)
+    end
+  end
+
+  def self.load(filepath = nil)
+    new(filepath).tap do |settings|
+      return unless settings.to_a
+    end
+  end
+end

data/lib/bosh-deployer/stub.rb

@@ -0,0 +1,47 @@
+require 'erb'
+require 'bosh-deployer/stub'
+require 'cancun'
+require 'cancun/highline'
+
+module Bosh; module Deployer; end ;end
+
+class Bosh::Deployer::Stub
+  include ::Cancun::Highline
+
+  attr_reader :filename
+
+  def initialize(path = '~/.bosh-deployer/stubs')
+    path = path[0..-2] if path[-1] == '/'
+    @filename = "#{path}/#{name}.yml"
+  end
+
+  def name
+    raise NotImplementedError
+  end
+
+  def generate
+    if File.exists?(filename) and !agree "#{filename} already exists, do you want to overwrite it?"
+      say 'Stub generation cancelled!'
+      return
+    end
+
+    save_stub
+  end
+
+  protected
+  def save_stub
+    stub.tap do |s|
+      say "Saving stub at #{filename}"
+      File.open(filename, 'w') { |f| f.write(s) }
+    end
+  end
+
+  def template
+    @template ||= ERB.new( File.read(File.expand_path("../../../stubs/#{name}.yml.erb", __FILE__)))
+  end
+
+  def stub
+    say_bold "Provide the following information for #{name} configuration:"
+    template.result(binding)
+  end
+end

data/lib/bosh-deployer/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Deployer
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/lib/bosh-deployer.rb

@@ -9,4 +9,6 @@ end
 
 require "bosh-deployer/version"
 require "bosh-deployer/stemcell"
+require "bosh-deployer/stub"
 require "bosh-deployer/bosh_stub"
+require "bosh-deployer/cf_stub"

data/spec/bosh_stub_spec.rb

@@ -1,29 +1,8 @@
-require 'cancun'
+require_relative 'support/helper'
 require 'bosh-deployer/bosh_stub'
+require 'cancun'
 require 'yaml'
 
-class Hash
-  def sort_by_key(recursive = false, &block)
-    self.keys.sort(&block).reduce({}) do |seed, key|
-      seed[key] = self[key]
-      if recursive && seed[key].is_a?(Hash)
-        seed[key] = seed[key].sort_by_key(true, &block)
-      end
-      seed
-    end
-  end
-end
-
-def equal_yaml(expected_file, actual_file)
-  @expected_content = File.read(expected_file)
-  @actual_content = File.read(actual_file)
-
-  expected = YAML.load(@expected_content).sort_by_key(true).to_a
-  actual = YAML.load(@actual_content).sort_by_key(true).to_a
-
-  expect(expected).to eq(actual)
-end
-
 describe Bosh::Deployer::BoshStub do
   include ::Cancun::Test
   before{ init_cancun_test }
@@ -31,25 +10,12 @@ describe Bosh::Deployer::BoshStub do
   let(:path){ 'tmp/'}
   let(:bosh_stub){ described_class.new(path) }
 
-  describe '#new' do
-    describe 'when path is given' do
-      it 'sets the filename to PATH/stubs' do
-        expect(bosh_stub.filename).to eq('tmp/bosh.yml')
-      end
-    end
-
-    describe 'when path is not given' do
-      let(:bosh_stub){ described_class.new }
-
-      it 'sets the filename to ~/.bosh-deployer/stubs' do
-        expect(bosh_stub.filename).to eq('~/.bosh-deployer/stubs/bosh.yml')
-      end
-    end
-  end
-
   describe '#generate' do
-    let(:settings_file) do
-      File.new('spec/fixtures/bosh-bootstrap/settings.yml')
+    let(:microbosh_settings) do
+      Bosh::Deployer::MicroboshSettings.new(
+        'spec/fixtures/bosh-bootstrap/settings.yml'
+      )
+
     end
 
     let(:args) do
@@ -59,14 +25,8 @@ 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)
-          .to receive(:open).with('~/.bootstrap/settings.yml')
-          .and_return(settings_file)
+        allow(Bosh::Deployer::MicroboshSettings)
+          .to receive(:load).and_return(microbosh_settings)
       end
 
 
@@ -95,22 +55,5 @@ 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/cf_stub_spec.rb

@@ -0,0 +1,39 @@
+require 'cancun'
+require 'bosh-deployer/cf_stub'
+require_relative 'support/helper'
+
+
+describe Bosh::Deployer::CFStub do
+  include ::Cancun::Test
+  before{ init_cancun_test }
+
+  let(:path){ 'tmp/'}
+  let(:cf_stub){ described_class.new(path) }
+
+  describe '#generate' do
+    let(:microbosh_settings) do
+      Bosh::Deployer::MicroboshSettings.new(
+        'spec/fixtures/bosh-bootstrap/settings.yml'
+      )
+    end
+    let(:args) do
+      ['2.2.2.2', '10.0.0.0/8', '1.2.3.4', 'MICROBOSH_SUBNET_ID', '3.3.3.3']
+    end
+
+    describe 'when .bootstrap/settings.yml exist' do
+      before do
+        `rm -rf tmp ; mkdir tmp`
+        allow(Bosh::Deployer::MicroboshSettings)
+          .to receive(:load).and_return(microbosh_settings)
+      end
+
+      it 'should generate the stub correctly' do
+        execute do
+          cf_stub.generate
+        end.and_type  *args
+        sleep 1 #TODO: develop wait for cmd after and type
+        equal_yaml('spec/fixtures/stubs/cloudfoundry.yml', 'tmp/cloudfoundry.yml')
+      end
+    end
+  end
+end