knife-joyent 0.4.5 → 0.4.8

data/README.md

@@ -33,6 +33,7 @@ Currently available commands:
     knife joyent server resize <server_id> -f <flavor>
     knife joyent server start <server_id>
     knife joyent server stop <server_id>
+    knife joyent server pricing
     knife joyent server metadata update <server_id> -m <json>
     knife joyent server metadata delete <server_id> <options>
     knife joyent snapshot create <server_id> <snapshot_name>

data/knife-joyent.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.add_dependency "fog", "~> 1.15.0"
+  s.add_dependency "fog", "~> 1.21.0"
   s.add_dependency "multi_json", "~> 1.7"
-  s.add_dependency "chef", ">= 0.10.10"
+  s.add_dependency "chef", "~> 11.6"
+  s.add_dependency "joyent-cloud-pricing", ">= 1.0.3"
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'guard-rspec'

data/lib/chef/knife/joyent_base.rb

@@ -1,5 +1,5 @@
 require 'chef/knife'
-require_relative '../../knife-joyent/pricing'
+require 'pricing'
 
 class Chef
   class Knife
@@ -73,10 +73,6 @@ class Chef
         end
       end
 
-      def pricing
-        @pricing ||= KnifeJoyent::Pricing::Config.new
-      end
-
       def locate_config_value(key)
         key = key.to_sym
         config[key] || Chef::Config[:knife][key]

data/lib/chef/knife/joyent_server_create.rb

@@ -239,24 +239,28 @@ class Chef
         Chef::Log.debug("Bootstrap distro = #{config[:distro]}")
         bootstrap.config[:distro] = config[:distro]
 
-        Chef::Log.debug("Bootstrap use_sudo = #{config[:use_sudo]}")
-        bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
+        if config[:ssh_user] == 'root'
+          bootstrap.config[:use_sudo] = false
+        else
+          bootstrap.config[:use_sudo] = true
+        end
+
+        Chef::Log.debug("Bootstrap use_sudo = #{bootstrap.config[:use_sudo]}")
 
-        Chef::Log.debug("Bootstrap environment = #{config[:environment]}")
         bootstrap.config[:environment] = config[:environment]
+        Chef::Log.debug("Bootstrap environment = #{bootstrap.config[:environment]}")
 
-        Chef::Log.debug("Bootstrap no_host_key_verify = #{config[:no_host_key_verify]}")
         bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
+        Chef::Log.debug("Bootstrap no_host_key_verify = #{bootstrap.config[:no_host_key_verify]}")
 
-        Chef::Log.debug("Bootstrap identity_file = #{config[:identity_file]}")
         bootstrap.config[:identity_file] = config[:identity_file]
+        Chef::Log.debug("Bootstrap identity_file = #{bootstrap.config[:identity_file]}")
 
-        Chef::Log.debug("Bootstrap ssh_gateway= #{config[:ssh_gateway]}")
         bootstrap.config[:ssh_gateway] = config[:ssh_gateway]
+        Chef::Log.debug("Bootstrap ssh_gateway= #{bootstrap.config[:ssh_gateway]}")
 
-
-        Chef::Log.debug("Bootstrap json_attributes = #{config[:json_attributes]}")
         bootstrap.config[:first_boot_attributes] = config[:json_attributes]
+        Chef::Log.debug("Bootstrap json_attributes = #{bootstrap.config[:json_attributes]}")
 
         bootstrap
       end

data/lib/chef/knife/joyent_server_list.rb

@@ -6,11 +6,42 @@ class Chef
 
       include Knife::JoyentBase
 
+      option :show,
+        :long => '--show field1,field1,.',
+        :description => 'Show additional fields. Supported: compute_node, tags',
+        :proc => Proc.new {|key| Chef::Config[:knife][:show] = key.to_s.split(/,/).map(&:to_sym)}
+
+      option :sort,
+        :long => '--sort field',
+        :description => 'Sort by field, default is name, supported also: compute_node, price',
+        :proc => Proc.new {|key| Chef::Config[:knife][:sort] = key.to_sym}
+
       banner "knife joyent server list <options>"
 
+      ADDITIONAL_FIELDS = [:compute_node, :tags]
+
+      PRICE_COLUMN_WIDTH = 11
+
       def run
-        columns = 11
-        price_column_width = 11
+
+        sort_matrix = {
+          :name => lambda do |a, b|
+            (a.name || '') <=> (b.name || '')
+          end,
+          :compute_node => lambda do |a, b|
+            if a.attributes && b.attributes
+              (a.attributes["compute_node"]) <=> (b.attributes["compute_node"])
+            end
+          end,
+          :price => lambda do |a, b|
+            if a.package && b.package
+              pricing.monthly_price(a.package) <=> pricing.monthly_price(b.package)
+            end
+          end
+        }
+
+        columns = 10 + num_of_extra_keys
+
 
         servers = [
           ui.color('ID', :bold),
@@ -22,15 +53,22 @@ class Chef
           ui.color('IPs', :bold),
           ui.color('      RAM', :bold),
           ui.color('    Disk', :bold),
-          ui.color('Price $/Month'),
-          ui.color('Tags', :bold)
+          ui.color('Price $/Month')
         ]
 
-        total_cost = 0
+        servers << ui.color('Compute Node', :bold) if show?(:compute_node)
+        servers << ui.color('Tags', :bold) if show?(:tags)
+
+        total_monthly_price = 0
+
+        prev_compute_node = nil # only needed if sorting by compute_node
+
+        self.connection.servers.sort(&sort_by(sort_matrix, sort_field)).each do |s|
+
+          compute_node = s.respond_to?(:attributes) ? s.attributes["compute_node"] : 'unknown'
+          columns.times { servers << "" } if sort_field == :compute_node && prev_compute_node && prev_compute_node != compute_node
+          prev_compute_node = compute_node
 
-        self.connection.servers.sort do |a, b|
-          (a.name || '') <=> (b.name || '')
-        end.each do |s|
           servers << s.id.to_s
           servers << s.name
 
@@ -45,7 +83,7 @@ class Chef
                          ui.color('unknown', :red)
                      end
 
-          flavor = s.respond_to?(:attributes) ? s.attributes["package"] : 'unknown'
+          flavor = s.package || 'unknown'
 
           servers << s.type
           servers << s.dataset
@@ -53,30 +91,47 @@ class Chef
           servers << s.ips.join(",")
           servers << "#{sprintf "%6.2f", s.memory/1024.0} GB"
           servers << "#{sprintf "%5.0f", s.disk/1024} GB"
-          servers << pricing.monthly_formatted_price_for_flavor(flavor, price_column_width)
+          servers << pricing.format_monthly_price(flavor, PRICE_COLUMN_WIDTH)
 
-          total_cost += (pricing[flavor] || 0)
+          servers << compute_node if show?(:compute_node)
+          servers << s.tags.map { |k, v| "#{k}:#{v}" }.join(' ') if (show?(:tags) && (s.tags rescue nil))
 
-          if (s.tags rescue nil)
-            servers << (show_tags? ? s.tags.map { |k, v| "#{k}:#{v}" }.join(' ') : "")
-          else
-            servers << "No Tags"
-          end
+          total_monthly_price += pricing.monthly_price(flavor)
         end
 
-        (columns - 3).times{servers << ""}
-        servers << "   Total"
-        servers << pricing.formatted_price_for_value(total_cost * pricing.class::HOURS_PER_MONTH,
-                                           price_column_width)
+        add_total_price(servers, total_monthly_price)
 
         puts ui.list(servers, :uneven_columns_across, columns)
       rescue => e
         output_error(e)
       end
 
-      def show_tags?
-        !ENV['SHOW_TAGS'].nil?
+      def add_total_price(servers, total_monthly_price)
+        8.times { servers << "" }
+        servers << "   Total"
+        servers << pricing.format_price(total_monthly_price, PRICE_COLUMN_WIDTH)
+      end
+
+      def show?(key)
+        (Chef::Config[:knife][:show] || []).include?(key)
       end
+
+      def num_of_extra_keys
+        ADDITIONAL_FIELDS.select{|k| show?(k)}.size
+      end
+
+      def sort_field
+        Chef::Config[:knife][:sort] || :name
+      end
+
+      def sort_by(matrix, field)
+        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

@@ -0,0 +1,30 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentServerPricing < Knife
+
+      include Knife::JoyentBase
+
+      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)',
+             :proc => Proc.new { |key| Chef::Config[:knife][:reserve_pricing] = key }
+
+      banner "knife joyent server pricing [-r <reserve-pricing-configuration.yml> ]"
+
+      def run
+        flavors = []
+        self.connection.servers.each do |s|
+          flavor = s.package || 'unknown'
+          flavors << flavor
+        end
+        reporter = Joyent::Cloud::Pricing::Reporter.new(Chef::Config[:knife][:reserve_pricing], flavors)
+        puts reporter.render
+      rescue => e
+        output_error(e)
+      end
+    end
+  end
+end

data/lib/knife-joyent/version.rb

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

data/lib/knife-joyent.rb

@@ -1,2 +1 @@
 require 'knife-joyent/version'
-require 'knife-joyent/pricing'

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@
 require 'knife-joyent'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.8
+  prerelease: 
 platform: ruby
 authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,43 +46,65 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.6'
+- !ruby/object:Gem::Dependency
+  name: joyent-cloud-pricing
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.10
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.10
+        version: 1.0.3
 - !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
@@ -119,6 +146,7 @@ files:
 - lib/chef/knife/joyent_server_list.rb
 - lib/chef/knife/joyent_server_metadata_delete.rb
 - lib/chef/knife/joyent_server_metadata_update.rb
+- lib/chef/knife/joyent_server_pricing.rb
 - lib/chef/knife/joyent_server_reboot.rb
 - lib/chef/knife/joyent_server_resize.rb
 - lib/chef/knife/joyent_server_start.rb
@@ -131,35 +159,31 @@ files:
 - lib/chef/knife/joyent_tag_list.rb
 - lib/knife-joyent.rb
 - lib/knife-joyent/fw.rb
-- lib/knife-joyent/pricing.rb
-- lib/knife-joyent/pricing/config.rb
 - lib/knife-joyent/version.rb
-- spec/pricing/config_spec.rb
 - 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: 2.0.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Joyent CloudAPI Support for Chef's Knife Command
 test_files:
-- spec/pricing/config_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 06f8a691e8fcef6cd3a29f19b6c1e0b690b600ba
-  data.tar.gz: 1b03a7c634502edc8a0d3b150772c71a3f342073
-SHA512:
-  metadata.gz: 3e1780a45058aa5788c6076209a4e4ab4c87de2dfad622a10efd79a32208b2d8d6a3145cf1f1754a52e089eeef7015813d38877e986df743999cf7ef5c6f9bf3
-  data.tar.gz: 71668684a9418d201ea0029f15f17879bf2a95eadcc89b7ff8986e28e9913b7ca0b1d426bc19c78e679e99916e0705827a928062fcf6c88efe9a1f041b419ece

data/lib/knife-joyent/pricing/config.rb

@@ -1,62 +0,0 @@
-require 'open-uri'
-require 'nokogiri'
-
-module KnifeJoyent
-  module Pricing
-    class Config < ::Hash
-      JOYENT_URL = "http://www.joyent.com/products/compute-service/pricing"
-      HOURS_PER_MONTH = 720
-
-      def initialize
-        super
-        from_uri
-      end
-
-      def from_uri(uri = JOYENT_URL)
-        parse_html_document Nokogiri::HTML(open(uri))
-      rescue
-      end
-
-      def from_html_file filename
-        parse_html_document Nokogiri::HTML(File.read(filename))
-      end
-
-      def monthly_price_for_flavor(flavor_name)
-        self[flavor_name] ? sprintf("$%.2f", self[flavor_name] * HOURS_PER_MONTH) : ""
-      end
-
-      def monthly_formatted_price_for_flavor(flavor, width = 10)
-        self[flavor] ? formatted_price_for_value(self[flavor] * HOURS_PER_MONTH, width) : ""
-      end
-
-      def formatted_price_for_value(value, width = 10)
-        sprintf("%#{width}s", currency_format(sprintf("$%.2f", value)))
-      end
-
-      # Returns string formatted with commas in the middle, such as "9,999,999"
-      def currency_format string
-         while string.sub!(/(\d+)(\d\d\d)/,'\1,\2'); end
-         string
-      end
-
-      private
-
-        def parse_html_document doc
-          mappings = Hash.new
-          specs = doc.css("ul.full-specs")
-          specs.each do |ul|
-            lis = ul.css("span").map(&:content)
-            # grab last two <li> elements in each <ul class="full-spec"> block
-            os, cost, flavor = lis[-3], lis[-2].gsub(/^\$/, ''), lis[-1]
-            next if cost == "N/A"
-            next if flavor =~ /kvm/ && os !~ /linux/i
-
-            mappings[flavor] = cost.to_f
-          end
-
-          self.merge! mappings
-        end
-    end
-  end
-end
-

data/lib/knife-joyent/pricing.rb

@@ -1 +0,0 @@
-require_relative 'pricing/config'

data/spec/pricing/config_spec.rb

@@ -1,42 +0,0 @@
-require_relative '../spec_helper'
-
-
-describe KnifeJoyent::Pricing::Config do
-  let(:config) { KnifeJoyent::Pricing::Config.new() }
-
-  let(:prices) { {"g3-standard-48-smartos" => 1.536,
-                  "g3-standard-0.625-smartos" => 0.02,
-                  "g3-standard-30-kvm" => 0.960} }
-
-  def verify
-    prices.keys.each do |flavor|
-      config[flavor].should eql(prices[flavor])
-    end
-  end
-
-  it "should load pricing configuration hash from Joyent Website" do
-    config.from_uri
-    verify
-  end
-
-  context "#monthly_price_for_flavor" do
-    it "should return properly formatted monthly price" do
-      expect(config.monthly_price_for_flavor "g3-standard-0.625-smartos").to eql("$14.40")
-      expect(config.monthly_price_for_flavor "g3-standard-30-kvm").to eql("$691.20")
-    end
-  end
-  context "#monthly_formatted_price_for_flavor" do
-    it "should return properly formatted monthly price" do
-      expect(config.monthly_formatted_price_for_flavor "g3-standard-48-smartos").to eql(" $1,105.92")
-    end
-    it "should return blank when no match was found" do
-      expect(config.monthly_formatted_price_for_flavor "asdfkasdfasdlfkjasl;dkjf").to eql("")
-    end
-  end
-  context "#formatted_price_for_value" do
-    it "should return properly formatted price" do
-      expect(config.formatted_price_for_value 24566.34).to eql("$24,566.34")
-      expect(config.formatted_price_for_value 4566.34).to eql(" $4,566.34")
-    end
-  end
-end