knife-joyent 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac165c3d7a0158856758ccbb1bf651fa82627002
-  data.tar.gz: 4e88bf3432f19c8745b23a6bcb90d30863e19cb2
+  metadata.gz: ee2fcd7ed58b4dc501d0499506fe5086d13d2d25
+  data.tar.gz: 9271025e54762e4a8c4d424fe09f87f832570c70
 SHA512:
-  metadata.gz: 3d13b2fbda64ed712cd6816d9f9bafbfa402b0e88873793f7b6adaf554c596cd54a0aa5432a0fa555ca0d080b8cb83c53762237ff953587ae243e83940011c70
-  data.tar.gz: df29deb158722b62918b54773280c1d91a2249ae709e690e164bc5a6e30d7a100ce48f52c1dab1093d214c23681a1388a2ef0083df7d35a2a722a241c7a7d30d
+  metadata.gz: ff52fed01168a0c8c36a71ba3e0ad3b2be6fcc1bc62645ba3e7d659ed34824ec28df21cbe4f06b1298c3d77eb0ecd6743e1cee18ef4c4daa0742b18f62d91df0
+  data.tar.gz: e7836fd3d2caeaf2684868409c04a57005c76b711fe45b684734bec5002be0dead2603c88c1b59316cb6cbee47afa9a552de967245358a70f19a1a0075f43403

data/.gitignore

@@ -3,3 +3,5 @@ pkg
 .bundle
 Gemfile.lock
 .DS_Store
+tmp/*
+.idea

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Guardfile

@@ -0,0 +1,24 @@
+# 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
+

data/README.md

@@ -48,26 +48,31 @@ Currently available commands:
 The following command will provision an Ubuntu 12.04 with 1GB of memory and bootstrap it with chef
 
     # knife joyent server create \
-        --joyent-api-version '~7.0' \
-        --flavor "Small 1GB" \
-        --networks 42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f \
-        --image d2ba0f30-bbe8-11e2-a9a2-6bc116856d85 \
-        --node-name 'cookbuntu1' \
-        --server-name 'cookbuntu1' \
-
-    Creating machine cookbuntu1
+    >         --joyent-api-version '~7.0' \
+    >         --flavor "Small 1GB" \
+    >         --networks 42325ea0-eb62-44c1-8eb6-0af3e2f83abc,c8cde927-6277-49ca-82a3-741e8b23b02f \
+    >         --image d2ba0f30-bbe8-11e2-a9a2-6bc116856d85 \
+    >         --node-name 'cookbuntu0' \
+    >         --server-name 'cookbuntu0'
+
+    Creating machine cookbuntu0
     Waiting for Server to be Provisioned
-    ......................
-    Bootstrap IP Address 165.225.150.195
+    ....................
+    Bootstrap IP Address 165.225.150.239
     No user defined in knife config for provision tagging -- continuing
     Created machine:
-    ID: ecd7c515-8079-41d9-a04a-0c5a1d93a2da
-    Name: cookbuntu1
+    ID: 9cdf6324-9769-4134-a7a8-a575c7dfcc13
+    Name: cookbuntu0
     State: running
     Type: virtualmachine
     Dataset: sdc:jpc:ubuntu-12.04:2.4.2
-    IPs: 165.225.150.195
+    IPs: 165.225.150.239 10.12.29.210
     Waiting for server to fully initialize...
+    Waiting for SSH to come up on: 165.225.150.239
+    SSHD accepting connections on 165.225.150.239: banner is SSH-2.0-OpenSSH_5.9p1 Debian-5ubuntu1
+
+    Bootstrapping Chef on 165.225.150.239
+    ...
 
 Please see ``knife joyent server create --help`` for more options
 

data/knife-joyent.gemspec

@@ -19,6 +19,10 @@ Gem::Specification.new do |s|
   s.add_dependency "fog", "~> 1.15.0"
   s.add_dependency "multi_json", "~> 1.7"
   s.add_dependency "chef", ">= 0.10.10"
+
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'guard-rspec'
+
   s.require_paths = ["lib"]
 
 end

data/lib/chef/knife/joyent_base.rb

@@ -1,4 +1,5 @@
 require 'chef/knife'
+require_relative '../../knife-joyent/pricing'
 
 class Chef
   class Knife
@@ -72,6 +73,10 @@ 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_flavor_list.rb

@@ -9,21 +9,24 @@ class Chef
       banner "knife joyent flavor list <options>"
 
       def run
+
         flavor_list = [
           ui.color('Name', :bold),
-          ui.color('RAM', :bold),
-          ui.color('Disk', :bold),
-          ui.color('Swap', :bold),
+          ui.color('      RAM', :bold),
+          ui.color('     Disk', :bold),
+          ui.color('    Swap', :bold),
+          ui.color('Price $/Hr', :bold),
         ]
 
         self.connection.flavors.sort_by(&:memory).each do |flavor|
           flavor_list << flavor.name.to_s
-          flavor_list << "#{flavor.memory/1024} GB"
-          flavor_list << "#{flavor.disk/1024} GB"
-          flavor_list << "#{flavor.swap/1024} GB"
+          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[flavor.name.to_s] ? sprintf("$%.3f", pricing[flavor.name.to_s]) : "")
         end
 
-        puts ui.list(flavor_list, :uneven_columns_across, 4)
+        puts ui.list(flavor_list, :uneven_columns_across, 5)
       end
     end
   end

data/lib/chef/knife/joyent_server_create.rb

@@ -20,7 +20,7 @@ class Chef
       option :server_name,
         :short => "-S NAME",
         :long => "--server-name <name>",
-        :description => "The Joyent server name"
+        :description => "The Joyent server name (may contain letters, numbers, dashes, and periods)"
 
       option :chef_node_name,
         :short => "-N NAME",
@@ -64,6 +64,12 @@ class Chef
         :boolean => true,
         :default => false
 
+      option :tags,
+        :long => "--tags JSON",
+        :description => "JSON-encoded {key:value} pairs tag server with",
+        :proc => Proc.new { |m| JSON.parse(m) },
+        :default => nil
+
       option :ssh_user,
         :short => "-x USERNAME",
         :long => "--ssh-user USERNAME",
@@ -155,15 +161,23 @@ class Chef
         Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip}")
         puts "\n"
         puts ui.color("Bootstrap IP Address #{bootstrap_ip}", :cyan)
+
+        if config[:tags]
+          tags = [ ui.color('Name', :bold), ui.color('Value', :bold) ]
+
+          server.add_tags(config[:tags]).each do |k,v|
+            tags << k
+            tags << v
+          end
+
+          puts ui.color("Updated tags for #{@node_name}", :cyan)
+          puts ui.list(tags, :uneven_columns_across, 2)
+        end
+
         if Chef::Config[:knife][:provisioner]
+          tags = [ ui.color('Name', :bold), ui.color('Value', :bold) ]
           # tag the provision with 'provisioner'
-          tagkey = 'provisioner'
-          tagvalue = Chef::Config[:knife][:provisioner]
-          tags = [
-            ui.color('Name', :bold),
-            ui.color('Value', :bold),
-          ]
-          server.add_tags({tagkey => tagvalue}).each do |k, v|
+          server.add_tags({'provisioner' => Chef::Config[:knife][:provisioner]}).each do |k, v|
             tags << k
             tags << v
           end
@@ -180,6 +194,7 @@ class Chef
         msg_pair("Type", server.type)
         msg_pair("Dataset", server.dataset)
         msg_pair("IPs", server.ips.join(" "))
+        msg_pair("Tags", config[:tags]) if config[:tags]
         msg_pair("JSON Attributes",config[:json_attributes]) unless config[:json_attributes].empty?
 
         puts ui.color("Waiting for server to fully initialize...", :cyan)

data/lib/chef/knife/joyent_server_list.rb

@@ -15,9 +15,10 @@ class Chef
           ui.color('State', :bold),
           ui.color('Type', :bold),
           ui.color('Image', :bold),
+          ui.color('Flavor', :bold),
           ui.color('IPs', :bold),
-          ui.color('RAM', :bold),
-          ui.color('Disk', :bold),
+          ui.color('      RAM', :bold),
+          ui.color('    Disk', :bold),
           ui.color('Tags', :bold)
         ]
 
@@ -40,18 +41,24 @@ class Chef
 
           servers << s.type
           servers << s.dataset
-          servers << s.ips.join(" ")
-          servers << "#{s.memory/1024} GB".to_s
-          servers << "#{s.disk/1024} GB".to_s
+          servers << (s.respond_to?(:attributes) ? s.attributes["package"] : 'unknown')
+          servers << s.ips.join(",")
+          servers << "#{sprintf "%6.2f", s.memory/1024.0} GB"
+          servers << "#{sprintf "%5.0f", s.disk/1024} GB"
 
-          if (servers.tags rescue nil)
-            servers << s.tags.map { |k, v| "#{k}:#{v}" }.join(' ')
+
+          if (s.tags rescue nil)
+            servers << (show_tags? ? s.tags.map { |k, v| "#{k}:#{v}" }.join(' ') : "")
           else
             servers << "No Tags"
           end
         end
 
-        puts ui.list(servers, :uneven_columns_across, 9)
+        puts ui.list(servers, :uneven_columns_across, 10)
+      end
+
+      def show_tags?
+        !ENV['SHOW_TAGS'].nil?
       end
     end
   end

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

@@ -0,0 +1,42 @@
+require 'open-uri'
+require 'nokogiri'
+
+module KnifeJoyent
+  module Pricing
+    class Config < ::Hash
+      JOYENT_URL = "http://www.joyent.com/products/compute-service/pricing"
+
+      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
+
+      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

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

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/knife-joyent.rb

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

data/spec/pricing/config_spec.rb

@@ -0,0 +1,26 @@
+require_relative '../spec_helper'
+
+
+
+describe KnifeJoyent::Pricing::Config do
+  context "URL Scraper" 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
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+#
+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
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
+- !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: 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'
 description: Joyent CloudAPI Support for Chef's Knife Command
 email:
 - kevin@joyent.com
@@ -62,8 +90,10 @@ extra_rdoc_files:
 - LICENSE
 files:
 - .gitignore
+- .rspec
 - CHANGES.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -91,7 +121,11 @@ files:
 - lib/chef/knife/joyent_tag_delete.rb
 - lib/chef/knife/joyent_tag_list.rb
 - lib/knife-joyent.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: {}
@@ -115,5 +149,7 @@ rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Joyent CloudAPI Support for Chef's Knife Command
-test_files: []
+test_files:
+- spec/pricing/config_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true