knife-softlayer 0.4.5 → 0.4.6

data/lib/chef/knife/softlayer.rb

@@ -1,14 +1,14 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require "knife-softlayer/version"
-
-module Knife
-  module Softlayer
-    # Your code goes here...
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require "knife-softlayer/version"
+
+module Knife
+  module Softlayer
+    # Your code goes here...
+  end
+end

data/lib/chef/knife/softlayer_base.rb

@@ -1,112 +1,112 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require 'chef/knife/bootstrap'
-require 'knife-softlayer/version'
-
-class Chef
-  class Knife
-    module SoftlayerBase
-
-      USER_AGENT = "Chef Knife Softlayer Plugin #{::Knife::Softlayer::VERSION}" unless defined? USER_AGENT
-
-      # :nodoc:
-      def self.included(includer)
-        includer.class_eval do
-
-          deps do
-            require 'fog/softlayer'
-            require 'net/ssh'
-            require 'net/ssh/multi'
-            require 'chef/monkey_patches/net-ssh-multi'
-            require 'readline'
-            require 'chef/exceptions'
-            require 'chef/search/query'
-            require 'chef/mixin/command'
-            require 'chef/mixin/shell_out'
-            require 'mixlib/shellout'
-            require 'chef/json_compat'
-          end
-
-          # Make the base bootstrap options available on topo bootstrap
-          self.options = (Chef::Knife::Bootstrap.options).merge(self.options)
-
-          option :softlayer_credential_file,
-                 :long => "--softlayer-credential-file FILE",
-                 :description => "File containing SoftLayer credentials as used by `softlayer_api` Ruby gem.",
-                 :proc => Proc.new { |key| Chef::Config[:knife][:softlayer_credential_file] = key }
-
-          option :softlayer_username,
-                 :short => "-U USERNAME",
-                 :long => "--softlayer-username KEY",
-                 :description => "Your SoftLayer Username",
-                 :proc => Proc.new { |key| Chef::Config[:knife][:softlayer_access_key_id] = key }
-
-          option :softlayer_api_key,
-                 :short => "-K SECRET",
-                 :long => "--softlayer-api-key SECRET",
-                 :description => "Your SoftLayer API Key",
-                 :proc => Proc.new { |key| Chef::Config[:knife][:softlayer_secret_access_key] = key }
-        end
-      end
-
-      ##
-      # Returns a connection to a SoftLayer API Service Endpoint.
-      # @param [Symbol] service
-      # @return [SoftLayer::Service]
-      def connection(service=:compute)
-        self.send(service)
-      end
-
-      def compute
-        @compute_connection ||= Fog::Compute.new(
-            :provider => :softlayer,
-            :softlayer_username => Chef::Config[:knife][:softlayer_username],
-            :softlayer_api_key => Chef::Config[:knife][:softlayer_api_key],
-            :softlayer_default_datacenter => Chef::Config[:knife][:softlayer_default_datacenter],
-            :softlayer_default_domain => Chef::Config[:knife][:softlayer_default_domain],
-        )
-      end
-
-      def network
-        @network_connection ||= Fog::Network.new(
-          :provider => :softlayer,
-          :softlayer_username => Chef::Config[:knife][:softlayer_username],
-          :softlayer_api_key => Chef::Config[:knife][:softlayer_api_key],
-        )
-      end
-
-      ##
-      # Locates a config value.
-      # @param [String] key
-      # @return [String]
-      def locate_config_value(key)
-        key = key.to_sym
-        config[key] || Chef::Config[:knife][key]
-      end
-
-      ##
-      # A CLI output formatting wrapper.
-      # @param [String] label
-      # @param [String] value
-      # @param [Symbol] color
-      # @return [String]
-      def msg_pair(label, value, color=:cyan)
-        if value && !value.to_s.empty?
-          puts "#{ui.color(label, color)}: #{value}"
-        end
-      end
-
-    end
-  end
-end
-
-module OS
-  def OS.windows?
-    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/bootstrap'
+require 'knife-softlayer/version'
+
+class Chef
+  class Knife
+    module SoftlayerBase
+
+      USER_AGENT = "Chef Knife Softlayer Plugin #{::Knife::Softlayer::VERSION}" unless defined? USER_AGENT
+
+      # :nodoc:
+      def self.included(includer)
+        includer.class_eval do
+
+          deps do
+            require 'fog/softlayer'
+            require 'net/ssh'
+            require 'net/ssh/multi'
+            require 'chef/monkey_patches/net-ssh-multi'
+            require 'readline'
+            require 'chef/exceptions'
+            require 'chef/search/query'
+            require 'chef/mixin/command'
+            require 'chef/mixin/shell_out'
+            require 'mixlib/shellout'
+            require 'chef/json_compat'
+          end
+
+          # Make the base bootstrap options available on topo bootstrap
+          self.options = (Chef::Knife::Bootstrap.options).merge(self.options)
+
+          option :softlayer_credential_file,
+                 :long => "--softlayer-credential-file FILE",
+                 :description => "File containing SoftLayer credentials as used by `softlayer_api` Ruby gem.",
+                 :proc => Proc.new { |key| Chef::Config[:knife][:softlayer_credential_file] = key }
+
+          option :softlayer_username,
+                 :short => "-U USERNAME",
+                 :long => "--softlayer-username KEY",
+                 :description => "Your SoftLayer Username",
+                 :proc => Proc.new { |key| Chef::Config[:knife][:softlayer_access_key_id] = key }
+
+          option :softlayer_api_key,
+                 :short => "-K SECRET",
+                 :long => "--softlayer-api-key SECRET",
+                 :description => "Your SoftLayer API Key",
+                 :proc => Proc.new { |key| Chef::Config[:knife][:softlayer_secret_access_key] = key }
+        end
+      end
+
+      ##
+      # Returns a connection to a SoftLayer API Service Endpoint.
+      # @param [Symbol] service
+      # @return [SoftLayer::Service]
+      def connection(service=:compute)
+        self.send(service)
+      end
+
+      def compute
+        @compute_connection ||= Fog::Compute.new(
+            :provider => :softlayer,
+            :softlayer_username => Chef::Config[:knife][:softlayer_username],
+            :softlayer_api_key => Chef::Config[:knife][:softlayer_api_key],
+            :softlayer_default_datacenter => Chef::Config[:knife][:softlayer_default_datacenter],
+            :softlayer_default_domain => Chef::Config[:knife][:softlayer_default_domain],
+        )
+      end
+
+      def network
+        @network_connection ||= Fog::Network.new(
+          :provider => :softlayer,
+          :softlayer_username => Chef::Config[:knife][:softlayer_username],
+          :softlayer_api_key => Chef::Config[:knife][:softlayer_api_key],
+        )
+      end
+
+      ##
+      # Locates a config value.
+      # @param [String] key
+      # @return [String]
+      def locate_config_value(key)
+        key = key.to_sym
+        config[key] || Chef::Config[:knife][key]
+      end
+
+      ##
+      # A CLI output formatting wrapper.
+      # @param [String] label
+      # @param [String] value
+      # @param [Symbol] color
+      # @return [String]
+      def msg_pair(label, value, color=:cyan)
+        if value && !value.to_s.empty?
+          puts "#{ui.color(label, color)}: #{value}"
+        end
+      end
+
+    end
+  end
+end
+
+module OS
+  def OS.windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+  end
+end

data/lib/chef/knife/softlayer_datacenter_list.rb

@@ -1,28 +1,28 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require 'chef/knife/softlayer_base'
-
-class Chef
-  class Knife
-    class SoftlayerDatacenterList < Knife
-
-      include Knife::SoftlayerBase
-
-      banner 'knife softlayer datacenter list (options)'
-
-      def run
-        $stdout.sync = true
-        table_data = connection(:network).datacenters.map do |dc|
-          {:name => dc.name, :long_name => dc.long_name }
-        end
-        puts Formatador.display_table(table_data, [:name, :long_name])
-      end
-
-    end
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerDatacenterList < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer datacenter list (options)'
+
+      def run
+        $stdout.sync = true
+        table_data = connection(:network).datacenters.map do |dc|
+          {:name => dc.name, :long_name => dc.long_name }
+        end
+        puts Formatador.display_table(table_data, [:name, :long_name])
+      end
+
+    end
+  end
+end

data/lib/chef/knife/softlayer_datacenter_show.rb

@@ -1,45 +1,45 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require 'chef/knife/softlayer_base'
-
-class Chef
-  class Knife
-    class SoftlayerDatacenterShow < Knife
-
-      include Knife::SoftlayerBase
-
-      banner 'knife softlayer datacenter show DATACENTER'
-
-      option :dc,
-             :short => "-a",
-             :long => "--all",
-             :description => "Display all available configuration options for launching an instance.",
-             :default => false
-
-
-      def run
-        unless name_args.size == 1
-          puts ui.color("Specify exactly one datacenter to show.", :red)
-          show_usage
-          exit 1
-        end
-
-        $stdout.sync = true
-        dc = connection(:network).datacenters.by_name(name_args[0])
-
-        puts "#{ui.color("Long Name:", :green)} #{dc.long_name}"
-        puts "#{ui.color("Name:", :green)} #{dc.name}"
-
-        puts "#{ui.color("Routers:", :green)}"
-        puts Formatador.display_table(dc.routers)
-
-      end
-
-    end
-  end
-end
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerDatacenterShow < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer datacenter show DATACENTER'
+
+      option :dc,
+             :short => "-a",
+             :long => "--all",
+             :description => "Display all available configuration options for launching an instance.",
+             :default => false
+
+
+      def run
+        unless name_args.size == 1
+          puts ui.color("Specify exactly one datacenter to show.", :red)
+          show_usage
+          exit 1
+        end
+
+        $stdout.sync = true
+        dc = connection(:network).datacenters.by_name(name_args[0])
+
+        puts "#{ui.color("Long Name:", :green)} #{dc.long_name}"
+        puts "#{ui.color("Name:", :green)} #{dc.name}"
+
+        puts "#{ui.color("Routers:", :green)}"
+        puts Formatador.display_table(dc.routers)
+
+      end
+
+    end
+  end
+end

data/lib/chef/knife/softlayer_delete.rb

@@ -1,6 +1,6 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#

data/lib/chef/knife/softlayer_flavor_list.rb

@@ -1,53 +1,53 @@
-#
-# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
-# © Copyright IBM Corporation 2014.
-#
-# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
-#
-
-require 'chef/knife/softlayer_base'
-require 'chef/knife/flavor/base'
-
-class Chef
-  class Knife
-    class SoftlayerFlavorList < Knife
-
-      include Knife::SoftlayerBase
-      include Knife::SoftlayerFlavorBase
-
-      banner 'knife softlayer flavor list (options)'
-
-      option :all,
-             :short => "-a",
-             :long => "--all",
-             :description => "Display all available configuration options for launching an instance.",
-             :default => false
-
-      ##
-      # Run the procedure to list softlayer VM flavors or display all available options.
-      # @return [nil]
-      def run
-        $stdout.sync = true
-        if config[:all]
-
-          if OS.windows?
-            puts ui.list(options_table, :uneven_columns_across, 6)
-          else
-            IO.popen('less', 'w') do |pipe|
-              pipe.puts ui.list(options_table, :uneven_columns_across, 6)
-            end
-          end
-
-          msg = "These options can be used in place of 'flavors'; See `knife softlayer server create --help` for details.\n"
-        else
-          puts connection.flavors.table([:id, :cpu, :ram, :disk,])
-          msg = "'flavors' provided here for convenience; SoftLayer allows you to choose a configuration a la carte.\nFor a full list of available instance options use --all with the `knife softlayer flavor list` subcommand."
-        end
-        puts ui.color("\nNOTICE: ", :yellow)
-        puts ui.color(msg)
-      end
-
-    end
-  end
-end
-
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+require 'chef/knife/flavor/base'
+
+class Chef
+  class Knife
+    class SoftlayerFlavorList < Knife
+
+      include Knife::SoftlayerBase
+      include Knife::SoftlayerFlavorBase
+
+      banner 'knife softlayer flavor list (options)'
+
+      option :all,
+             :short => "-a",
+             :long => "--all",
+             :description => "Display all available configuration options for launching an instance.",
+             :default => false
+
+      ##
+      # Run the procedure to list softlayer VM flavors or display all available options.
+      # @return [nil]
+      def run
+        $stdout.sync = true
+        if config[:all]
+
+          if OS.windows?
+            puts ui.list(options_table, :uneven_columns_across, 6)
+          else
+            IO.popen('less', 'w') do |pipe|
+              pipe.puts ui.list(options_table, :uneven_columns_across, 6)
+            end
+          end
+
+          msg = "These options can be used in place of 'flavors'; See `knife softlayer server create --help` for details.\n"
+        else
+          puts connection.flavors.table([:id, :cpu, :ram, :disk,])
+          msg = "'flavors' provided here for convenience; SoftLayer allows you to choose a configuration a la carte.\nFor a full list of available instance options use --all with the `knife softlayer flavor list` subcommand."
+        end
+        puts ui.color("\nNOTICE: ", :yellow)
+        puts ui.color(msg)
+      end
+
+    end
+  end
+end
+