joyent-provisioner 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 112ca66cf4b1b153f6ec273ff04ba83ae59cd053
-  data.tar.gz: ea701940d4b0dddd2af5d402c2eac05952bfc88a
+  metadata.gz: fa248d1cf9f18ede6e0ad3e8485fe325ba1fc95f
+  data.tar.gz: 40f04cc5329317d54febf9ff74317c5dbd26b5ef
 SHA512:
-  metadata.gz: 66e9595db1d605ef08471a86eb2632c71a3629f9ad352bb3e831731520870b2cca5733e570b90759b25837d52df81db51aaba068acaeb6d8f7088ecf039d8196
-  data.tar.gz: fc21b4800f1addad8e44cbc17b1dcbf70398a662594e597f68fb297e5f580fac34545a59413073a220b01c65f8a819ccbfd8e6d1b0c1449bad160356f3ddd9ac
+  metadata.gz: a444c2695fdfd38d8af205800c07f49329f10e8daeceef49ca0d127cf8051a41ed2802981fe4615224cf255cafb06a5c0559ea6119d7c54bb4370e04d422be97
+  data.tar.gz: 70f817b1523020ed4650f698be20513a65b61371a11549e9b789b7d6773f05aa339b74f5458b3e15640011cca6919fa601e74e41be7a7fc1c374bd77ac7effa2

data/joyent-provisioner.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'mixlib-cli'
   spec.add_dependency 'chef'
-  spec.add_dependency 'knife-joyent'
-  spec.add_dependency 'colorize'
+  spec.add_dependency 'knife-joyent', '>= 0.3.4'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
@@ -29,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry-debugger'
+  spec.add_development_dependency 'aruba-doubles'
 end

data/lib/joyent-provisioner.rb

@@ -1,12 +1,10 @@
 module Provisioner
 end
 
-require 'colorize'
-
 require_relative 'provisioner/usage'
 require_relative 'provisioner/logger'
 require_relative 'provisioner/helper'
 require_relative 'provisioner/configuration'
 require_relative 'provisioner/host_ip'
 require_relative 'provisioner/cli'
-require_relative 'provisioner/command/base'
+require_relative 'provisioner/command/base'

data/lib/provisioner/cli/bootstrap.rb

@@ -24,7 +24,7 @@ class Provisioner::CLI::Bootstrap < Provisioner::CLI
 
     if config[:dry]
       provisioner_command.shell_commands.each do |command|
-        puts command.colorize(:green)
+        puts command
       end
     else
       provisioner_command.run

data/lib/provisioner/cli/provision.rb

@@ -11,7 +11,7 @@ class Provisioner::CLI::Provision < Provisioner::CLI
 
     if config[:dry]
       provisioner_command.shell_commands.each do |command|
-        puts command.colorize(:green)
+        puts command
       end
     else
       provisioner_command.run

data/lib/provisioner/command/base.rb

@@ -3,7 +3,8 @@ module Provisioner
     class Base
       attr_accessor :image, :flavor, :distro, :networks, :run_list,
                     :host_sequence, :host_prefix, :environment, :host_suffix,
-                    :host_presuffix, :log_dir, :host_number, :options, :ssh_user
+                    :host_presuffix, :log_dir, :host_number, :options, :ssh_user,
+                    :tags
 
       def initialize(template_configuration, options = {})
         @options = options
@@ -51,7 +52,7 @@ module Provisioner
 
       def shellout(command)
         puts "Running provision command:"
-        puts command.colorize(:green)
+        puts command
         system(command)
       end
     end

data/lib/provisioner/command/provision.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Provisioner
   module Command
     class Provision < Base
@@ -14,11 +16,19 @@ module Provisioner
             "--networks #{networks}",
             "--environment #{environment}",
             "--node-name #{host_name}",
-        ].join(' ')
+        ]
+
 
         log_path = "#{log_dir}/#{host_name}_provision.log"
-        command << " --run-list #{run_list}" if run_list
-        command << " 2>&1 > #{log_path} &"
+        command << "--run-list #{run_list}" if run_list
+        command << "--tags '#{encoded_tags}'" if tags
+        command << "2>&1 > #{log_path} &"
+
+        command.join(' ')
+      end
+
+      def encoded_tags
+        JSON.dump(tags)
       end
 
     end

data/lib/provisioner/host_ip.rb

@@ -12,14 +12,14 @@ module Provisioner
     def self.ips
       @ips = {}
       server_list.each do |server|
-        hostname, ip = server.split(' ')
+        hostname, ip = server.split(' ').compact
         @ips[hostname] = ip
       end
       @ips
     end
 
     def self.server_list
-      @server_list ||= `knife joyent server list | awk '{print $2 " " $6}' | tail +2`.split("\n")
+      @server_list ||= `knife joyent server list | awk '{print $2 " " $7}' | tail +2`.split("\n")
     end
   end
-end
+end

data/lib/provisioner/version.rb

@@ -1,3 +1,3 @@
 module Provisioner
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/provisioner/command/provision_spec.rb

@@ -4,12 +4,10 @@ describe Provisioner::Command::Provision do
   let(:configuration) { Provisioner::Configuration.from_path('spec/fixtures/test.yml') }
 
   describe '#shell_commands' do
-
     context 'host is specified' do
-
       let(:subject) { Provisioner::Command::Provision.new(template_configuration, number: '1') }
-      let(:expected_command) { [
-          'knife joyent server create',
+
+      let(:command_options) { [
           '--image 9ec5c0c-a941-11e2-a7dc-57a6b041988f',
           '--flavor g3-highmemory-17.125-smartos',
           '--distro smartos-base64',
@@ -17,8 +15,13 @@ describe Provisioner::Command::Provision do
           '--environment test',
           '--node-name memcached-sessions001.test',
           '--run-list role[joyent]',
+      ] }
+
+      let(:expected_command) { [
+          'knife joyent server create',
+          command_options,
           '2>&1 > ./tmp/memcached-sessions001.test_provision.log &'
-      ].join(' ') }
+      ].flatten.join(' ')}
 
       context 'passing options directly' do
         let(:template_configuration) { {
@@ -33,9 +36,19 @@ describe Provisioner::Command::Provision do
             log_dir: './tmp',
             run_list: 'role[joyent]'
         } }
+
         it 'returns expected command string' do
           expect(subject.shell_commands).to eq([expected_command])
         end
+
+        context 'tags are included' do
+          it 'passes tags to knife-joyent' do
+            template_configuration[:tags] = {a: 1, b: 2, c: 3}
+            command_options << "--tags '{\"a\":1,\"b\":2,\"c\":3}'"
+
+            expect(subject.shell_commands).to eq([expected_command])
+          end
+        end
       end
 
       context 'using the template from yaml configuration' do

data/spec/provisioner/host_ip_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
 
 describe Provisioner::HostIP do
+  describe '.ip_for' do
+    let(:header) { "ID                                    Name                                    State    Type            Image                        Flavor                        IPs                                   RAM      Disk  Tags\n" }
+    let(:server001) { "a67c6340-4bf4-11e3-8f96-0800200c9a66 app001.stage running smartmachine sdc:sdc:base64:13.1.0 g3-highmemory-17.125-smartos 1.1.1.1   17.12 GB    420 GB\n" }
+    let(:server002) { "eb332d70-4bf4-11e3-8f96-0800200c9a66 app002.stage running smartmachine sdc:sdc:base64:13.1.0 g3-highmemory-17.125-smartos 1.1.1.2   17.12 GB    420 GB\n" }
+    let(:servers) { [header, server001, server002].join }
 
-  before do
-    Provisioner::HostIP.stub(:server_list){ ['app001.stage 1.1.1.1', 'app002.stage 1.1.1.2']}
-  end
-
+    before do
+      double_cmd('knife joyent server list', puts: servers)
+    end
 
-  describe '.ip_for' do
     it 'returns the IP address given a hostname' do
       expect(Provisioner::HostIP.ip_for('app001.stage')).to eq('1.1.1.1')
+      expect(Provisioner::HostIP.ip_for('app002.stage')).to eq('1.1.1.2')
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,9 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
 require 'joyent-provisioner'
+require 'aruba-doubles'
+
+require 'support/aruba'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
@@ -17,4 +20,15 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.include ArubaDoubles
+
+  config.before(:each) do
+    ArubaDoubles::Double.setup
+  end
+
+  config.after(:each) do
+    ArubaDoubles::Double.teardown
+    history.clear
+  end
 end

data/spec/support/aruba.rb

@@ -0,0 +1,5 @@
+module ArubaHelpers
+  def self.history
+    @history ||= ArubaDoubles::History.new(File.join(ArubaDoubles::Double.bindir, ArubaDoubles::HISTORY_FILE))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent-provisioner
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Konstantin Gredeskoul
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -46,28 +46,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +138,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba-doubles
+  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'
 description: Wrapper gem around provisioning clusters of servers on Joyent cloud
 email:
 - kigster@gmail.com
@@ -195,6 +195,7 @@ files:
 - spec/provisioner/configuration_spec.rb
 - spec/provisioner/host_ip_spec.rb
 - spec/spec_helper.rb
+- spec/support/aruba.rb
 homepage: ''
 licenses:
 - MIT
@@ -215,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Wrapper gem around provisioning clusters of servers on Joyent cloud
@@ -228,3 +229,4 @@ test_files:
 - spec/provisioner/configuration_spec.rb
 - spec/provisioner/host_ip_spec.rb
 - spec/spec_helper.rb
+- spec/support/aruba.rb