knife-joyent 0.0.10 → 0.1.0

data/lib/chef/knife/joyent_server_reboot.rb

@@ -1,33 +1,34 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
+class Chef
+  class Knife
+    class JoyentServerReboot < Knife
 
-module KnifeJoyent
-  class JoyentServerReboot < Chef::Knife
+      include Knife::JoyentBase
 
-    include KnifeJoyent::Base
+      banner 'knife joyent server reboot <server_id>'
 
-    banner 'knife joyent server reboot <server_id>'
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
 
-    def run
-      unless name_args.size === 1
-        show_usage
-        exit 1
-      end
-
-      id = name_args.first
+        id = name_args.first
 
-      server = self.connection.servers.get(id)
-      unless server
-        puts ui.error("Server with id: #{id} not found")
-        exit 1
-      end
+        server = self.connection.servers.get(id)
+        unless server
+          puts ui.error("Server with id: #{id} not found")
+          exit 1
+        end
 
-      if server.reboot
-        puts ui.color("Rebooted Server #{id}", :cyan)
-        exit 0
-      else
-        puts ui.error("Reboot server failed")
-        exit 1
+        if server.reboot
+          puts ui.color("Rebooted Server #{id}", :cyan)
+          exit 0
+        else
+          puts ui.error("Reboot server failed")
+          exit 1
+        end
       end
     end
   end

data/lib/chef/knife/joyent_server_resize.rb

@@ -1,43 +1,44 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
-
-
-module KnifeJoyent
-  class JoyentServerResize < Chef::Knife
-
-    include KnifeJoyent::Base
-
-    banner 'knife joyent server resize <server_id> -f <flavor>'
-
-    option :flavor,
-      :short => "-f <flavor>",
-      :long => "--flavor <flavor>",
-      :description => "name of flavor/package to resize to"
-
-    def run
-      unless config[:flavor]
-        show_usage
-        exit 1
-      end
-
-      unless name_args.size === 1
-        show_usage
-        exit 1
-      end
-
-      id = name_args.first
-
-      server = self.connection.servers.get(id)
-      unless server
-        puts ui.error("Server with id: #{id} not found")
-        exit 1
-      end
-
-      if self.connection.resize_machine(id, config[:flavor])
-        puts ui.color("Resized server #{id}", :cyan)
-        exit 0
-      else
-        puts ui.error("Resize server failed")
-        exit 1
+require 'chef/knife/joyent_base'
+
+class Chef
+  class Knife
+    class JoyentServerResize < Knife
+
+      include Knife::JoyentBase
+
+      banner 'knife joyent server resize <server_id> -f <flavor>'
+
+      option :flavor,
+        :short => "-f <flavor>",
+        :long => "--flavor <flavor>",
+        :description => "name of flavor/package to resize to"
+
+      def run
+        unless config[:flavor]
+          show_usage
+          exit 1
+        end
+
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
+
+        id = name_args.first
+
+        server = self.connection.servers.get(id)
+        unless server
+          puts ui.error("Server with id: #{id} not found")
+          exit 1
+        end
+
+        if self.connection.resize_machine(id, config[:flavor])
+          puts ui.color("Resized server #{id}", :cyan)
+          exit 0
+        else
+          puts ui.error("Resize server failed")
+          exit 1
+        end
       end
     end
   end

data/lib/chef/knife/joyent_server_start.rb

@@ -1,39 +1,41 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
-module KnifeJoyent
-  class JoyentServerStart < Chef::Knife
+class Chef
+  class Knife
+    class JoyentServerStart < Knife
 
-    include KnifeJoyent::Base
+      include Knife::JoyentBase
 
-    banner 'knife joyent server start <server_id>'
+      banner 'knife joyent server start <server_id>'
 
-    def run
-      unless name_args.size === 1
-        show_usage
-        exit 1
-      end
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
 
-      id = name_args.first
+        id = name_args.first
 
-      server = self.connection.servers.get(id)
+        server = self.connection.servers.get(id)
 
-      unless server
-        puts ui.error("Unable to locate server: #{id}")
-        exit 1
-      end
+        unless server
+          puts ui.error("Unable to locate server: #{id}")
+          exit 1
+        end
 
-      if server.ready?
-        puts ui.error("Server is already started")
-        exit 1
-      end
+        if server.ready?
+          puts ui.error("Server is already started")
+          exit 1
+        end
 
-      if server.start
-        puts ui.color("Started server: #{id}", :cyan)
-        exit 0
-      else
-        puts ui.error("Start server failed")
-        exit 1
+        if server.start
+          puts ui.color("Started server: #{id}", :cyan)
+          exit 0
+        else
+          puts ui.error("Start server failed")
+          exit 1
+        end
       end
-    end
+    end 
   end
 end

data/lib/chef/knife/joyent_server_stop.rb

@@ -1,39 +1,40 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
+class Chef
+  class Knife
+    class JoyentServerStop < Knife
 
-module KnifeJoyent
-  class JoyentServerStop < Chef::Knife
+      include Knife::JoyentBase
 
-    include KnifeJoyent::Base
+      banner 'knife joyent server stop <server_id>'
 
-    banner 'knife joyent server stop <server_id>'
+      def run
+        unless name_args.size === 1
+          show_usage
+          exit 1
+        end
 
-    def run
-      unless name_args.size === 1
-        show_usage
-        exit 1
-      end
-
-      id = name_args.first
+        id = name_args.first
 
-      server = self.connection.servers.get(id)
+        server = self.connection.servers.get(id)
 
-      unless server
-        puts ui.error("Unable to locate server: #{id}")
-        exit 1
-      end
+        unless server
+          puts ui.error("Unable to locate server: #{id}")
+          exit 1
+        end
 
-      if server.stopped?
-        puts ui.error("Server #{id} is already stopped")
-        exit 1
-      end
+        if server.stopped?
+          puts ui.error("Server #{id} is already stopped")
+          exit 1
+        end
 
-      if server.stop
-        puts ui.color("Stopped server: #{id}", :cyan)
-        exit 0
-      else
-        puts ui.error("Failed to stop server")
-        exit 1
+        if server.stop
+          puts ui.color("Stopped server: #{id}", :cyan)
+          exit 0
+        else
+          puts ui.error("Failed to stop server")
+          exit 1
+        end
       end
     end
   end

data/lib/chef/knife/joyent_snapshot_create.rb

@@ -1,9 +1,10 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
-module KnifeJoyent
-  class JoyentSnapshotCreate < Chef::Knife
+class Chef
+  class Knife
+  class JoyentSnapshotCreate < Knife
 
-    include KnifeJoyent::Base
+    include Knife::JoyentBase
 
     banner 'knife joyent snapshot create <server> <snapshot_name>'
 
@@ -25,19 +26,19 @@ module KnifeJoyent
         :created => snapshot.created
       })
       exit 0
-    rescue Excon::Errors::Conflict => e
-      if e.response && e.response.body.kind_of?(String)
-        error = MultiJson.decode(e.response.body)
-        puts ui.error(error['message'])
-        exit 1
-      else
-        puts ui.error(e.message)
+      rescue Excon::Errors::Conflict => e
+        if e.response && e.response.body.kind_of?(String)
+          error = MultiJson.decode(e.response.body)
+          puts ui.error(error['message'])
+          exit 1
+        else
+          puts ui.error(e.message)
+          exit 1
+        end
+      rescue => e
+        puts ui.error('Unexpected Error Occured:' + e.message)
         exit 1
       end
-    rescue => e
-      puts ui.error('Unexpected Error Occured:' + e.message)
-      exit 1
     end
-
   end
 end

data/lib/chef/knife/joyent_snapshot_delete.rb

@@ -1,41 +1,42 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
-module KnifeJoyent
-  class JoyentSnapshotDelete < Chef::Knife
+class Chef
+  class Knife
+    class JoyentSnapshotDelete < Knife
 
-    include KnifeJoyent::Base
+      include Knife::JoyentBase
 
-    banner 'knife joyent snapshot delete <server> <snapshot_name>'
+      banner 'knife joyent snapshot delete <server> <snapshot_name>'
 
-    def run
-      unless name_args.size == 2
-        show_usage
-        exit 1
-      end
+      def run
+        unless name_args.size == 2
+          show_usage
+          exit 1
+        end
 
-      server = name_args[0]
-      ssname = name_args[1]
+        server = name_args[0]
+        ssname = name_args[1]
 
-      snapshot = self.connection.snapshots.get(server, ssname)
-      snapshot.destroy
-      puts ui.color("Deleted snapshot #{snapshot.name}", :cyan)
-      exit 0
-    rescue Excon::Errors::NotFound => e
-      puts ui.error("Snapshot #{ssname} on server #{server} not found")
-      exit 1
-    rescue Excon::Errors::Conflict => e
-      if e.response && e.response.body.kind_of?(String)
-        error = MultiJson.decode(e.response.body)
-        puts ui.error(error['message'])
+        snapshot = self.connection.snapshots.get(server, ssname)
+        snapshot.destroy
+        puts ui.color("Deleted snapshot #{snapshot.name}", :cyan)
+        exit 0
+      rescue Excon::Errors::NotFound => e
+        puts ui.error("Snapshot #{ssname} on server #{server} not found")
         exit 1
-      else
-        puts ui.error(e.message)
+      rescue Excon::Errors::Conflict => e
+        if e.response && e.response.body.kind_of?(String)
+          error = MultiJson.decode(e.response.body)
+          puts ui.error(error['message'])
+          exit 1
+        else
+          puts ui.error(e.message)
+          exit 1
+        end
+      rescue => e
+        puts ui.error('Unexpected Error Occured:' + e.message)
         exit 1
       end
-    rescue => e
-      puts ui.error('Unexpected Error Occured:' + e.message)
-      exit 1
     end
-
   end
 end

data/lib/chef/knife/joyent_snapshot_list.rb

@@ -1,44 +1,45 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
+class Chef
+  class Knife
+    class JoyentSnapshotList < Knife
 
-module KnifeJoyent
-  class JoyentSnapshotList < Chef::Knife
+      include Knife::JoyentBase
 
-    include KnifeJoyent::Base
+      banner "knife joyent snapshot list <server_id>"
 
-    banner "knife joyent snapshot list <server_id>"
+      def run
 
-    def run
-
-      unless name_args.size == 1
-        show_usage
-        exit 1
-      end
+        unless name_args.size == 1
+          show_usage
+          exit 1
+        end
 
-      server = name_args.first
-
-      snapshots = [
-        ui.color('ID', :bold),
-        ui.color('State', :bold),
-        ui.color('Created', :bold),
-      ]
-
-      self.connection.snapshots.all(server).each do |s|
-        snapshots << ui.color(s.name, :bold)
-        snapshots << case s.state
-        when "queued" then
-          ui.color(s.state, :yellow)
-        when "success" then
-          ui.color(s.state, :green)
-        else
-          ui.color(s.state, :red)
+        server = name_args.first
+
+        snapshots = [
+          ui.color('ID', :bold),
+          ui.color('State', :bold),
+          ui.color('Created', :bold),
+        ]
+
+        self.connection.snapshots.all(server).each do |s|
+          snapshots << ui.color(s.name, :bold)
+          snapshots << case s.state
+          when "queued" then
+            ui.color(s.state, :yellow)
+          when "success" then
+            ui.color(s.state, :green)
+          else
+            ui.color(s.state, :red)
+          end
+          snapshots << s.created.to_s
         end
-        snapshots << s.created.to_s
-      end
 
-      puts ui.list(snapshots, :uneven_columns_across, 3)
-    rescue Fog::Compute::Joyent::Errors::NotFound
-      puts ui.error("Server #{server} not found.")
+        puts ui.list(snapshots, :uneven_columns_across, 3)
+      rescue Fog::Compute::Joyent::Errors::NotFound
+        puts ui.error("Server #{server} not found.")
+      end
     end
   end
 end

data/lib/chef/knife/joyent_tag_create.rb

@@ -1,38 +1,40 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
-module KnifeJoyent
-  class JoyentTagCreate < Chef::Knife
+class Chef
+  class Knife
+    class JoyentTagCreate < Knife
 
-    include KnifeJoyent::Base
+      include Knife::JoyentBase
 
-    banner "knife joyent tag create <server_id> <tag> <value>"
+      banner "knife joyent tag create <server_id> <tag> <value>"
 
-    def run
-      server = name_args[0]
-      tagkey = name_args[1]
-      tagvalue = name_args[2]
+      def run
+        server = name_args[0]
+        tagkey = name_args[1]
+        tagvalue = name_args[2]
 
-      unless server || tagkey || tagvalue
-        show_usage
-        exit 1
-      end
+        unless server || tagkey || tagvalue
+          show_usage
+          exit 1
+        end
 
-      tags = [
-        ui.color('Name', :bold),
-        ui.color('Value', :bold),
-      ]
+        tags = [
+          ui.color('Name', :bold),
+          ui.color('Value', :bold),
+        ]
 
-      self.connection.servers.get(server).add_tags({tagkey => tagvalue}).each do |k, v|
-        tags << k
-        tags << v
-      end
+        self.connection.servers.get(server).add_tags({tagkey => tagvalue}).each do |k, v|
+          tags << k
+          tags << v
+        end
 
-      puts ui.color("Updated tags for #{server}", :cyan)
-      puts ui.list(tags, :uneven_columns_across, 2)
-      exit 0
-    rescue Excon::Errors::NotFound => e
-      puts ui.error("Server #{server} not found")
-      exit 1
+        puts ui.color("Updated tags for #{server}", :cyan)
+        puts ui.list(tags, :uneven_columns_across, 2)
+        exit 0
+      rescue Excon::Errors::NotFound => e
+        puts ui.error("Server #{server} not found")
+        exit 1
+      end
     end
   end
 end

data/lib/chef/knife/joyent_tag_delete.rb

@@ -1,62 +1,64 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
-module KnifeJoyent
-  class JoyentTagDelete < Chef::Knife
+class Chef
+  class Knife
+    class JoyentTagDelete < Knife
 
-    include KnifeJoyent::Base
+      include Knife::JoyentBase
 
-    banner ["knife joyent tag delete <server_id> <tag>",
-            "knife joyent tag delete <server_id> -A"].join("\n")
+      banner ["knife joyent tag delete <server_id> <tag>",
+              "knife joyent tag delete <server_id> -A"].join("\n")
 
 
-    option :all,
-      :short => "-A",
-      :long => "--all",
-      :boolean => true,
-      :description => "delete all tags on the machine"
+      option :all,
+        :short => "-A",
+        :long => "--all",
+        :boolean => true,
+        :description => "delete all tags on the machine"
 
-    def run
-      server_id = name_args[0]
-      tagname = name_args[1]
-      all = config[:all]
+      def run
+        server_id = name_args[0]
+        tagname = name_args[1]
+        all = config[:all]
 
-      if !server_id || (all == false && !tagname) || (all && tagname)
-        show_usage
-        exit 1
-      end
-
-      begin
-        server = self.connection.servers.get(server_id)
-      rescue Excon::Errors::NotFound => e
-        puts ui.error("Server #{server_id} not found")
-        exit 1
-      end
+        if !server_id || (all == false && !tagname) || (all && tagname)
+          show_usage
+          exit 1
+        end
 
-      if all
-        server.delete_all_tags
-        puts ui.color("Deleted all tags for #{server_id}", :cyan)
-        exit 0
-      else
         begin
-          server.delete_tag(tagname)
+          server = self.connection.servers.get(server_id)
         rescue Excon::Errors::NotFound => e
-          puts ui.error("Tag #{tagname} on server #{server_id} not found")
+          puts ui.error("Server #{server_id} not found")
           exit 1
         end
 
-        tags = [
-          ui.color('Name', :bold),
-          ui.color('Value', :bold),
-        ]
+        if all
+          server.delete_all_tags
+          puts ui.color("Deleted all tags for #{server_id}", :cyan)
+          exit 0
+        else
+          begin
+            server.delete_tag(tagname)
+          rescue Excon::Errors::NotFound => e
+            puts ui.error("Tag #{tagname} on server #{server_id} not found")
+            exit 1
+          end
 
-        server.reload.tags.each do |k, v|
-          tags << k
-          tags << v
+          tags = [
+            ui.color('Name', :bold),
+            ui.color('Value', :bold),
+          ]
+
+          server.reload.tags.each do |k, v|
+            tags << k
+            tags << v
+          end
+          puts ui.color("Deleted tag #{tagname} for #{server_id}", :cyan)
+          puts ui.list(tags, :uneven_columns_across, 2)
         end
-        puts ui.color("Deleted tag #{tagname} for #{server_id}", :cyan)
-        puts ui.list(tags, :uneven_columns_across, 2)
+        exit 0
       end
-      exit 0
     end
   end
 end