joyent-provisioner 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 860b7897d55c42ced7dfd1fa360cc09765dd6cc3
-  data.tar.gz: 11e5c7ec4fdd921fa36650c60f80a0de78f5fa00
+  metadata.gz: fe09a5771e1b1681e5f0e930c8aa8e3b233b7765
+  data.tar.gz: 1ae3401ea7fd9ae0deeba26652bd5c96de36ed47
 SHA512:
-  metadata.gz: 13adab230399a64dd9c48df3b4d6fafb986096a51f045cdf0599e95ce5ca8f04b33d245133c9bc17fc0574adf9309b5210a9d83e3dc616df289dccf1eff3962c
-  data.tar.gz: 7feeda2e8746b56d334cc946dc2e889648d41a32ad77f56e6b160bf9c737b2fdce09eb995da74f9553413a4b9bf8af3db7fe84af259d3f98cb3851c87261ddfb
+  metadata.gz: 7fb38b8a0029d19c5729b1e912c13f504faa6e386bb9670df703373171e460b17fa1cfb4f635460ec3eae7b8aa79a200957639ed390651a56b502934326aa41b
+  data.tar.gz: 42aa53c944d2f02146aabb358410941c3a4ae9ddccbbb62bd74460e435a332e4b6aad10435788d724299582e5a27e3c03b5b84b502fcd41c5d3effc8d0f77281

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/conf/configuration.yml.example

@@ -2,7 +2,6 @@ global:
   environment: test
   host_suffix: test
   log_dir: ./tmp
-  ssh_user: ops
 
 templates:
   memcached-sessions:
@@ -14,3 +13,12 @@ templates:
     host_sequence: 1..2
     host_prefix: memcached-sessions
 
+  memcached-sessions-ssh:
+    image: 9ec5c0c-a941-11e2-a7dc-57a6b041988f
+    flavor: "g3-highmemory-17.125-smartos"
+    distro: smartos-base64
+    networks: "42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f"
+    run_list: "role[joyent]"
+    host_sequence: 1..2
+    host_prefix: memcached-sessions-ssh
+    ssh_user: ops

data/joyent-provisioner.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'pry-debugger'
+  spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'aruba-doubles'
 end

data/lib/provisioner/command/provision.rb

@@ -21,6 +21,7 @@ module Provisioner
 
         log_path = "#{log_dir}/#{host_name}_provision.log"
         command << "--run-list #{run_list}" if run_list
+        command << "--ssh-user #{ssh_user}" if ssh_user
         command << "--tags '#{encoded_tags}'" if tags
         command << "2>&1 > #{log_path} &"
 

data/lib/provisioner/version.rb

@@ -1,3 +1,3 @@
 module Provisioner
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/provisioner/cli/host_spec.rb

@@ -1,3 +1,4 @@
+
 require 'spec_helper'
 
 describe 'provision cli' do
@@ -9,7 +10,7 @@ describe 'provision cli' do
 
   describe 'host number is provided' do
     let(:expected_command) {'knife joyent server create --image 9ec5c0c-a941-11e2-a7dc-57a6b041988f --flavor g3-highmemory-17.125-smartos --distro smartos-base64 --networks 42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f --environment test --node-name memcached-sessions545.test --run-list role[joyent] 2>&1 > ./tmp/memcached-sessions545.test_provision.log &'}
-    it 'reads the configuration and generates command' do
+    it 'reads the configuration and generates command from memcached-sessions' do
       result = execute('provisioner provision --number 545 --config conf/configuration.yml.example --template memcached-sessions')
       expect(result).to eq(expected_command)
     end
@@ -18,6 +19,14 @@ describe 'provision cli' do
       result = execute('provisioner provision -n 545 -c conf/configuration.yml.example -t memcached-sessions')
       expect(result).to eq(expected_command)
     end
+
+    let(:expected_command_ssh) {'knife joyent server create --image 9ec5c0c-a941-11e2-a7dc-57a6b041988f --flavor g3-highmemory-17.125-smartos --distro smartos-base64 --networks 42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f --environment test --node-name memcached-sessions-ssh545.test --run-list role[joyent] --ssh-user ops 2>&1 > ./tmp/memcached-sessions-ssh545.test_provision.log &'}
+    it 'reads the configuration and generates command from memcached-sessions2' do
+      result = execute('provisioner provision --number 545 --config conf/configuration.yml.example --template memcached-sessions-ssh')
+      expect(result).to eq(expected_command_ssh)
+    end
+
+
   end
 
   describe 'host number is not provided' do
@@ -30,3 +39,5 @@ describe 'provision cli' do
     end
   end
 end
+
+

data/spec/provisioner/command/provision_spec.rb

@@ -15,6 +15,7 @@ describe Provisioner::Command::Provision do
           '--environment test',
           '--node-name memcached-sessions001.test',
           '--run-list role[joyent]',
+          '--ssh-user ops', 
       ] }
 
       let(:expected_command) { [
@@ -34,6 +35,7 @@ describe Provisioner::Command::Provision do
             host_prefix: 'memcached-sessions',
             environment: 'test',
             log_dir: './tmp',
+            ssh_user: 'ops',
             run_list: 'role[joyent]'
         } }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent-provisioner
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
@@ -10,146 +10,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     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: chef
   requirement: !ruby/object:Gem::Requirement
     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: knife-joyent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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
   name: guard
   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: guard-rspec
   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: rspec
   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: pry-debugger
+  name: pry-nav
   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: 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
@@ -162,9 +162,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -206,17 +206,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Wrapper gem around provisioning clusters of servers on Joyent cloud
@@ -230,3 +230,4 @@ test_files:
 - spec/provisioner/host_ip_spec.rb
 - spec/spec_helper.rb
 - spec/support/aruba.rb
+has_rdoc: