knife-joyent 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97840b8a3ec364a32ca0735ec200d7f0a0823351
-  data.tar.gz: 298e8434baa3a3c1d469fa0a39b748c3f04af02f
+  metadata.gz: 45293468ec017cf7ebb0f58f4a0d3a95531dad56
+  data.tar.gz: bfe1d3c0b2da13606dc83038fb815ca2e7dd0532
 SHA512:
-  metadata.gz: b24792faf5a1d8b15c6e1ba29630a5f1213fe95872d863b94664dc52f0de3017204b117916584b4d2df4044378ac2d1e6670987c5f4212fd09088eb17079f0b0
-  data.tar.gz: 16b9f5f771f78863116eb109397c467e459b348ca0e3b1d27da71c3bd711570575f617c9a930ab503319566fd859ab707f4c6ff361d4d494ebf9144ccb2a7da2
+  metadata.gz: 97084d24162cf1f927515cd3b64a097fed154c04b9c4937a1df969aa2f329e5fbdfd69c78f8e07320409a0ced22d26585ab2a41f44c896e55ac199d5216e9784
+  data.tar.gz: 58c05b85366ac511235eb3bd10847694333f0e17ca3bb595254505bcf743c578b1dd515dea310181aa92afe0b6fc46ee247b6ee11a43380354996f8d782d1ef7

data/README.md

@@ -43,17 +43,26 @@ Currently available commands:
     knife joyent tag delete <server_id> -A
     knife joyent tag list <server_id>
 
+    # requires joyent_version 7.1+
+    knife joyent server fw enable <server_id>
+    knife joyent server fw disable <server_id>
+    knife joyent fw get <fwrule_id>
+    knife joyent fw create (options)
+    knife joyent fw list <server_id>
+    knife joyent fw update <rule_id> (options)
+    knife joyent fw delete <rule_id> (options)
+
 ## Example Usage
 
 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 'cookbuntu0' \
-    >         --server-name 'cookbuntu0'
+        --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
@@ -111,7 +120,7 @@ to automatically unlock the key for authentication.
 **``joyent_api_url``**
 
 Specifies a custom CloudAPI endpoint, this is required if you want to manage
-machines located in another datacenter or if you want to interface with any CloudAPI 
+machines located in another datacenter or if you want to interface with any CloudAPI
 instance powered by [SmartDataCenter](http://www.joyent.com/products/smartdatacenter/).
 
 Defaults to us-west-1
@@ -141,7 +150,7 @@ the form of a hash with a single level of nesting. See the
 By default, knife-joyent will use the version of the Joyent Cloud API that fog prefers. This
 can be overridden in knife.rb as follows:
 
-    knife[:joyent_version] = "~7.0"
+    knife[:joyent_version] = "~7.1"
 
 Some command line options to knife-joyent subcommands may depend on the Joyent API version set.
 

data/lib/chef/knife/joyent_base.rb

@@ -82,6 +82,19 @@ class Chef
         config[key] || Chef::Config[:knife][key]
       end
 
+      def output_error_response(res)
+        if (res.body['message'])
+          ui.error ui.color(res.body["message"], :white)
+        end
+
+        if (res.body["errors"])
+          errors = res.body["errors"]
+          errors.each do |e|
+            ui.error("[#{e["field"]}] #{e["message"]}")
+          end
+        end
+      end
+
       def msg_pair(label, value = nil)
         if value && !value.empty?
           puts "#{ui.color(label, :cyan)}: #{value}"

data/lib/chef/knife/joyent_flavor_list.rb

@@ -9,13 +9,12 @@ 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('Price $/Hr', :bold),
+          ui.color('$ Per Month', :bold),
         ]
 
         self.connection.flavors.sort_by(&:memory).each do |flavor|
@@ -23,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[flavor.name.to_s] ? sprintf("$%.3f", pricing[flavor.name.to_s]) : "")
+          flavor_list << pricing.monthly_formatted_price_for_flavor(flavor.name.to_s, 10)
         end
 
         puts ui.list(flavor_list, :uneven_columns_across, 5)
@@ -31,3 +30,4 @@ class Chef
     end
   end
 end
+

data/lib/chef/knife/joyent_fw_create.rb

@@ -0,0 +1,48 @@
+require 'chef/knife/joyent_base'
+require 'pp'
+
+class Chef
+  class Knife
+    class JoyentFwCreate < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent fw create (options)"
+
+      option :rule,
+        :long => "--rule RULE",
+        :description => "Firewall Rule Content"
+
+      option :enabled,
+        :long => "--enabled",
+        :boolean => true,
+        :description => "Enable/Disable Rule"
+
+      def run
+        unless config[:rule]
+          show_usage
+          exit 1
+        end
+
+        res = self.connection.request(
+          :method => "POST",
+          :path => "/my/fwrules",
+          :body => {
+            "enabled" => config[:enabled],
+            "rule" => config[:rule],
+          }
+        )
+
+        unless res.status == 201
+          output_error_response(res)
+        else
+          r = res.body
+
+          ui.info "Created Firewall Rule: #{r["id"]}"
+          msg_pair "RULE", r["rule"]
+          msg_pair "ENABLED", (r["enabled"] ? ui.color("✓ YES", :cyan) : "✗ NO")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_fw_delete.rb

@@ -0,0 +1,39 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentFwDelete < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent fw delete <fw_id>"
+
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
+
+        id = name_args.first
+        # puts id
+        res = self.connection.request(
+          :method => "DELETE",
+          :path => "/my/fwrules/#{id}"
+        )
+
+        rules = [
+          ui.color('ID', :bold),
+          ui.color('Enabled', :bold),
+          ui.color('Rule', :bold),
+        ]
+
+        if res.status == 204
+          ui.info "Rule #{id} Deleted."
+        else
+          self.output_error_response(res)
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_fw_get.rb

@@ -0,0 +1,43 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentFwGet < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent fw get <fw_id>"
+
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
+
+        id = name_args.first
+        # puts id
+        res = self.connection.request(
+          :method => "GET",
+          :path => "/my/fwrules/#{id}"
+        )
+
+        rules = [
+          ui.color('ID', :bold),
+          ui.color('Enabled', :bold),
+          ui.color('Rule', :bold),
+        ]
+
+        if (res.status == 422)
+          output_error_response(res)
+        else
+          r = res.body
+          rules << r["id"]
+          rules << (r["enabled"] ? ui.color("✓", :cyan) : "✗")
+          rules << r["rule"]
+          ui.list(rules, :uneven_columns_across, 3)
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_fw_list.rb

@@ -0,0 +1,43 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentFwList < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent fw list"
+
+      def run
+        if name_args.size > 0
+          id = name_args.first
+          res = self.connection.request(
+            :method => "GET",
+            :path => "/my/machines/#{id}/fwrules"
+          )
+        else
+          res = self.connection.request(
+            :method => "GET",
+            :path => "/my/fwrules"
+          )
+        end
+
+        if res.status == 200
+          rules = [
+            ui.color('ID', :bold),
+            ui.color('Enabled', :bold),
+            ui.color('Rule', :bold),
+          ]
+
+          res[:body].each do |r|
+            rules << r["id"]
+            rules << (r["enabled"] ? ui.color("✓", :cyan) : "✗")
+            rules << r["rule"]
+          end
+        else
+          output_error_response(res)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_fw_update.rb

@@ -0,0 +1,49 @@
+require 'chef/knife/joyent_base'
+require 'pp'
+
+class Chef
+  class Knife
+    class JoyentFwUpdate < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent fw update <rule_id> (options)"
+
+      option :rule,
+        :long => "--rule RULE",
+        :description => "Firewall Rule Content"
+
+      option :enabled,
+        :long => "--enabled",
+        :boolean => true,
+        :description => "Enable/Disable Rule"
+
+      def run
+        id = name_args.first
+        unless id || (!config.key?(:rule) || !config.key?(:enabled))
+          show_usage
+          exit 1
+        end
+
+        res = self.connection.request(
+          :method => "POST",
+          :path => "/my/fwrules/#{id}",
+          :body => {
+            "enabled" => config[:enabled],
+            "rule" => config[:rule],
+          }
+        )
+
+        unless res.status == 200
+          output_error_response(res)
+        else
+          r = res.body
+
+          ui.info "Created Firewall Rule: #{r["id"]}"
+          msg_pair "RULE", r["rule"]
+          msg_pair "ENABLED", (r["enabled"] ? ui.color("✓ YES", :cyan) : "✗ NO")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_server_fw_disable.rb

@@ -0,0 +1,34 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentServerFwDisable < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent server fw disable <server_id>"
+
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
+
+        id = name_args.first
+
+        path = "/my/machines/#{id}"
+        res = self.connection.request(
+          :method => "POST",
+          :path => path,
+          :query => {"action" => "disable_firewall"}
+        )
+
+        if (res.status == 202)
+          puts ui.color("Firewall Disabled for server #{id}", :cyan)
+        else
+          output_error_response(res)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_server_fw_enable.rb

@@ -0,0 +1,33 @@
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentServerFwEnable < Knife
+
+      include Knife::JoyentBase
+
+      banner "knife joyent server fw enable <server_id>"
+
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
+
+        id = name_args.first
+        # puts id
+        res = self.connection.request(
+          :method => "POST",
+          :path => "/my/machines/#{id}",
+          :query => {"action" => "enable_firewall"}
+        )
+
+        if (res.status === 202)
+          ui.info ui.color("Firewall Enabled for server #{id}", :cyan)
+        else
+          output_error_response(res)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_server_list.rb

@@ -9,6 +9,9 @@ class Chef
       banner "knife joyent server list <options>"
 
       def run
+        columns = 11
+        price_column_width = 11
+
         servers = [
           ui.color('ID', :bold),
           ui.color('Name', :bold),
@@ -19,9 +22,12 @@ class Chef
           ui.color('IPs', :bold),
           ui.color('      RAM', :bold),
           ui.color('    Disk', :bold),
+          ui.color('Price $/Month'),
           ui.color('Tags', :bold)
         ]
 
+        total_cost = 0
+
         self.connection.servers.sort do |a, b|
           (a.name || '') <=> (b.name || '')
         end.each do |s|
@@ -29,23 +35,27 @@ class Chef
           servers << s.name
 
           servers << case s.state
-          when 'running'
-            ui.color(s.state, :green)
-          when 'stopping', 'provisioning'
-            ui.color(s.state, :yellow)
-          when 'stopped'
-            ui.color(s.state, :red)
-          else
-            ui.color('unknown', :red)
-          end
+                       when 'running'
+                         ui.color(s.state, :green)
+                       when 'stopping', 'provisioning'
+                         ui.color(s.state, :yellow)
+                       when 'stopped'
+                         ui.color(s.state, :red)
+                       else
+                         ui.color('unknown', :red)
+                     end
+
+          flavor = s.respond_to?(:attributes) ? s.attributes["package"] : 'unknown'
 
           servers << s.type
           servers << s.dataset
-          servers << (s.respond_to?(:attributes) ? s.attributes["package"] : 'unknown')
+          servers << flavor
           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)
 
+          total_cost += (pricing[flavor] || 0)
 
           if (s.tags rescue nil)
             servers << (show_tags? ? s.tags.map { |k, v| "#{k}:#{v}" }.join(' ') : "")
@@ -54,7 +64,12 @@ class Chef
           end
         end
 
-        puts ui.list(servers, :uneven_columns_across, 10)
+        (columns - 3).times{servers << ""}
+        servers << "   Total"
+        servers << pricing.formatted_price_for_value(total_cost * pricing.class::HOURS_PER_MONTH,
+                                           price_column_width)
+
+        puts ui.list(servers, :uneven_columns_across, columns)
       end
 
       def show_tags?

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

@@ -5,6 +5,7 @@ module KnifeJoyent
   module Pricing
     class Config < ::Hash
       JOYENT_URL = "http://www.joyent.com/products/compute-service/pricing"
+      HOURS_PER_MONTH = 720
 
       def initialize
         super
@@ -20,6 +21,24 @@ module KnifeJoyent
         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
@@ -40,3 +59,4 @@ module KnifeJoyent
     end
   end
 end
+

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/spec/pricing/config_spec.rb

@@ -1,26 +1,42 @@
 require_relative '../spec_helper'
 
 
-
 describe KnifeJoyent::Pricing::Config do
-  context "URL Scraper" do
-
-    let(:config) { KnifeJoyent::Pricing::Config.new() }
+  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 } }
+  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
+  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
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -100,6 +100,11 @@ files:
 - knife-joyent.gemspec
 - lib/chef/knife/joyent_base.rb
 - lib/chef/knife/joyent_flavor_list.rb
+- lib/chef/knife/joyent_fw_create.rb
+- lib/chef/knife/joyent_fw_delete.rb
+- lib/chef/knife/joyent_fw_get.rb
+- lib/chef/knife/joyent_fw_list.rb
+- lib/chef/knife/joyent_fw_update.rb
 - lib/chef/knife/joyent_image_list.rb
 - lib/chef/knife/joyent_key_add.rb
 - lib/chef/knife/joyent_key_delete.rb
@@ -107,6 +112,8 @@ files:
 - lib/chef/knife/joyent_network_list.rb
 - lib/chef/knife/joyent_server_create.rb
 - lib/chef/knife/joyent_server_delete.rb
+- lib/chef/knife/joyent_server_fw_disable.rb
+- lib/chef/knife/joyent_server_fw_enable.rb
 - lib/chef/knife/joyent_server_list.rb
 - lib/chef/knife/joyent_server_metadata_delete.rb
 - lib/chef/knife/joyent_server_metadata_update.rb
@@ -121,6 +128,7 @@ files:
 - lib/chef/knife/joyent_tag_delete.rb
 - 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