knife-joyent 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 671988423a3e9399059e8ec751f8dcbe2e6ba024
-  data.tar.gz: fd0fae85db93261f3381900c3cfef6be0e104261
+  metadata.gz: dd612430e612429131cac5d965a7491c451f30cb
+  data.tar.gz: 07853ff2dc10dca35f0f377c8de9f73b620fbc31
 SHA512:
-  metadata.gz: d8106e6b800ccec1915531c63d02a592d7eae324023f3a0f30524b22aab127e0368c793ee061b70778e26f40871eb1d11b91dd12c8d5ba834365b5ec4cae359a
-  data.tar.gz: 87af80ca2eecc9633979cc11b14a8b2f313ad8cf0a16179e5e78c02c20756924a044f68dd708588fa35d21c52f6779c3a51ca993edee5f3445f749a6847f8cf3
+  metadata.gz: 9eb4a8bd6ee44c113d61ede4cbf75d3874cdd7db6bd788a6911c74e7ed48701402984cd6b285e5c5845871050dbd0a6e50e82fbab67e699427129a8159cd0d40
+  data.tar.gz: 6a84b2cfda6962f223deb92857aeba107e481bbbe115aca3b7cf7a5e6a2223845071b258250376ee614ec856b75f60c02bb3bfbbc780c70db698ea698566b9a0

data/knife-joyent.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "fog", "~> 1.21.0"
   s.add_dependency "multi_json", "~> 1.7"
   s.add_dependency "chef", "~> 11.6"
-  s.add_dependency "joyent-cloud-pricing", ">= 1.0.9"
+  s.add_dependency "joyent-cloud-pricing", ">= 1.1.0"
 
   s.add_development_dependency 'rspec'
 

data/lib/chef/knife/joyent_server_create.rb

@@ -110,6 +110,10 @@ class Chef
         :description => "The ssh gateway server",
         :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key }
 
+      option :ssh_init_delay,
+        :long => "--ssh-init-delay SECS",
+        :description => "Seconds to sleep after SSH starts answering on new machine",
+        :default => 10
 
       def is_linklocal(ip)
         linklocal = IPAddr.new "169.254.0.0/16"
@@ -209,7 +213,9 @@ class Chef
 
         puts ui.color("Waiting for SSH to come up on: #{bootstrap_ip}", :cyan)
         tcp_test_ssh(bootstrap_ip)
-        sleep 10
+
+        puts ui.color("Sleeping for #{config[:ssh_init_delay]} seconds", :cyan)
+        sleep config[:ssh_init_delay]
 
         bootstrap_for_node(server, bootstrap_ip).run
 

data/lib/chef/knife/joyent_server_pricing.rb

@@ -9,16 +9,21 @@ class Chef
       option :reserve_pricing,
              :short => '-r <file>',
              :long => '--reserve-pricing <file>',
-             :description => 'Apply reserve discounts from a YAML config (see joyent-cloud-pricing gem)',
+             :description => 'Apply custom pricing from a YAML file (see: joyent-cloud-pricing gem)',
              :proc => Proc.new { |key| Chef::Config[:knife][:reserve_pricing] = key }
 
       option :show_zones,
              :short => '-z',
-             :long => '--show-zones',
-             :description => 'Print list of on-demand zones sorted by price',
+             :long => '--show-zone-flavors',
+             :description => 'Print aggregated list of zone flavors sorted by price',
              :proc => Proc.new { |key| Chef::Config[:knife][:show_zones] = key }
 
-      banner 'knife joyent server pricing [-r <reserve-pricing.yml> ] [ -z ] '
+      option :no_color,
+             :long => '--no-color',
+             :description => 'Disable color when printing',
+             :proc => Proc.new { |key| Chef::Config[:knife][:no_color] = true }
+
+      banner 'knife joyent server pricing [-r <custom-pricing.yml>] [-z] [--no-color]'
 
       def run
         flavors = []
@@ -26,9 +31,10 @@ class Chef
           flavor = s.package || 'unknown'
           flavors << flavor
         end
-        reporter = Joyent::Cloud::Pricing::Reporter.new(Chef::Config[:knife][:reserve_pricing], flavors)
-        reporter.print_zone_list = Chef::Config[:knife][:show_zones]
-        puts reporter.render
+        config = Chef::Config[:knife]
+        reporter = Joyent::Cloud::Pricing::Reporter.new(config[:reserve_pricing], flavors)
+        reporter.print_zone_list = config[:show_zones]
+        puts reporter.render(:disable_color => config[:no_color])
       rescue => e
         output_error(e)
       end

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement