knife-joyent 0.4.8 → 0.4.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 671988423a3e9399059e8ec751f8dcbe2e6ba024
+  data.tar.gz: fd0fae85db93261f3381900c3cfef6be0e104261
+SHA512:
+  metadata.gz: d8106e6b800ccec1915531c63d02a592d7eae324023f3a0f30524b22aab127e0368c793ee061b70778e26f40871eb1d11b91dd12c8d5ba834365b5ec4cae359a
+  data.tar.gz: 87af80ca2eecc9633979cc11b14a8b2f313ad8cf0a16179e5e78c02c20756924a044f68dd708588fa35d21c52f6779c3a51ca993edee5f3445f749a6847f8cf3

data/README.md

@@ -171,6 +171,7 @@ by/from different sources / users.
  - [Sean Omera](https://github.com/someara) - Opscode
  - [Eric Saxby](https://github.com/sax) - Wanelo
  - [Stephen Lauck](https://github.com/stephenlauck) - ModCloth
+ - [Konstantin Gredeskoul](https://github.com/kigster) - Wanelo
 
 ## Bootstrap template for smartos
 

data/knife-joyent.gemspec

@@ -19,10 +19,9 @@ 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.3"
+  s.add_dependency "joyent-cloud-pricing", ">= 1.0.9"
 
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'guard-rspec'
 
   s.require_paths = ["lib"]
 

data/lib/chef/knife/joyent_base.rb

@@ -132,6 +132,11 @@ class Chef
         end
         obj
       end
+
+      def pricing
+        @pricing ||= Joyent::Cloud::Pricing::Formatter.new(Joyent::Cloud::Pricing::Configuration.instance)
+      end
+
     end
   end
 end

data/lib/chef/knife/joyent_flavor_list.rb

@@ -22,7 +22,7 @@ class Chef
           flavor_list << "#{sprintf "%6.2f", flavor.memory/1024.0} GB"
           flavor_list << "#{sprintf "%6.0f", flavor.disk/1024.0} GB"
           flavor_list << "#{sprintf "%5.0f", flavor.swap/1024.0} GB"
-          flavor_list << pricing.monthly_formatted_price_for_flavor(flavor.name.to_s, 10)
+          flavor_list << pricing.format_monthly_price(flavor.name.to_s, 10)
         end
 
         puts ui.list(flavor_list, :uneven_columns_across, 5)

data/lib/chef/knife/joyent_server_list.rb

@@ -128,10 +128,6 @@ class Chef
         matrix[field.to_sym] || matrix[:name]
       end
 
-      def pricing
-        @pricing ||= Joyent::Cloud::Pricing::Formatter.new(Joyent::Cloud::Pricing::Configuration.instance)
-      end
-
     end
   end
 end

data/lib/chef/knife/joyent_server_pricing.rb

@@ -9,10 +9,16 @@ class Chef
       option :reserve_pricing,
              :short => '-r <file>',
              :long => '--reserve-pricing <file>',
-             :description => 'Apply reserve pricing to instances that qualify from a YAML file (see joyent-cloud-pricing gem)',
+             :description => 'Apply reserve discounts from a YAML config (see joyent-cloud-pricing gem)',
              :proc => Proc.new { |key| Chef::Config[:knife][:reserve_pricing] = key }
 
-      banner "knife joyent server pricing [-r <reserve-pricing-configuration.yml> ]"
+      option :show_zones,
+             :short => '-z',
+             :long => '--show-zones',
+             :description => 'Print list of on-demand zones sorted by price',
+             :proc => Proc.new { |key| Chef::Config[:knife][:show_zones] = key }
+
+      banner 'knife joyent server pricing [-r <reserve-pricing.yml> ] [ -z ] '
 
       def run
         flavors = []
@@ -21,6 +27,7 @@ class Chef
           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
       rescue => e
         output_error(e)

data/lib/knife-joyent/version.rb

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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.4.8
-  prerelease: 
+  version: 0.4.9
 platform: ruby
 authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,49 +55,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: joyent-cloud-pricing
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.9
 - !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'
-- !ruby/object:Gem::Dependency
-  name: guard-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: Joyent CloudAPI Support for Chef's Knife Command
@@ -120,7 +93,6 @@ files:
 - .rspec
 - CHANGES.md
 - Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -163,27 +135,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/kevinykchan/knife-joyent
 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: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Joyent CloudAPI Support for Chef's Knife Command
 test_files:
 - spec/spec_helper.rb
+has_rdoc: true

data/Guardfile

@@ -1,24 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard :rspec do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
-