serverkit 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d88e5f03bf3c76a8195af458f1a596074db889a6
-  data.tar.gz: 35387a924e18aa5a1653d83d36793eb2817a8faf
+  metadata.gz: 65f599078706665a41712a95fac9fceb098ab617
+  data.tar.gz: c83b4d7ca7377f8029300646eb11f5ea9f105a95
 SHA512:
-  metadata.gz: 62499c66973b3de08fec3836eb0079fcffa6a5050c2fb44cd939abf615821da02fed7512a4aef64048a0d6786fefb52245a1dac0a04960a93c1a6de5ed1a072d
-  data.tar.gz: e341d3fb9c9c1de9dafe79a3fd6c4deb96b330ddb171f95da4cd246edce08e833168648f78259c5d2d02161b0060f2aad01534947266459da054bd12ea30d970
+  metadata.gz: f6ab8e2a496800ee62a5fcd8676e5d82fa8cd2b96c07a03462fc535d8f489e3f1e1d1731e042bfdff1c0d1bdb231733b23bfbb2f825179c80deaeec0f0b034de
+  data.tar.gz: 36bfe26ca78820a08f6049237fb74793de3a711db6d03059f3b8140a0851f8d33c5f5c681881e369b1fe682158293decf62671416e1c9c4d6653f886c7265faf

data/.rubocop.yml

@@ -1,3 +1,6 @@
+Lint/HandleExceptions:
+  Enabled: false
+
 Lint/UnusedBlockArgument:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.8
+- Support SSH options injection on action class
+
 ## 0.2.7
 - Ignore missing Gemfile error
 

data/lib/serverkit/actions/base.rb

@@ -1,7 +1,6 @@
 require "bundler"
 require "etc"
 require "net/ssh"
-require "serverkit/errors/missing_recipe_path_argument_error"
 require "serverkit/loaders/recipe_loader"
 require "serverkit/recipe"
 require "slop"
@@ -10,9 +9,15 @@ require "specinfra"
 module Serverkit
   module Actions
     class Base
-      # @param [Array] argv Command-line arguments given to serverkit executable
-      def initialize(argv)
-        @argv = argv
+      # @param [String, nil] hosts
+      # @param [String] recipe_path
+      # @param [Hash, nil] ssh_options For override default ssh options
+      # @param [Stirng, nil] variables_path
+      def initialize(hosts: nil, recipe_path: nil, ssh_options: nil, variables_path: nil)
+        @hosts = hosts
+        @recipe_path = recipe_path
+        @ssh_options = ssh_options
+        @variables_path = variables_path
       end
 
       def call
@@ -28,14 +33,14 @@ module Serverkit
 
       # @return [Array<Specinfra::Backend::Base>]
       def backends
-        if options[:hosts]
+        if has_hosts?
           hosts.map do |host|
             backend_class.new(
               disable_sudo: true,
               host: host,
               ssh_options: {
                 user: ssh_user_for(host),
-              },
+              }.merge(ssh_options),
             )
           end
         else
@@ -44,7 +49,7 @@ module Serverkit
       end
 
       def backend_class
-        if options[:hosts]
+        if has_hosts?
           Specinfra::Backend::Ssh
         else
           Specinfra::Backend::Exec
@@ -56,16 +61,14 @@ module Serverkit
       rescue Bundler::GemfileNotFound
       end
 
-      def hosts
-        options[:hosts].split(",")
+      def has_hosts?
+        !@hosts.nil?
       end
 
-      # @return [Slop] Command-line options
-      def options
-        @options ||= Slop.parse!(@argv, help: true) do
-          banner "Usage: serverkit ACTION [options]"
-          on "--hosts=", "Pass hostname to execute command over SSH"
-          on "--variables=", "Path to variables file for ERB recipe"
+      # @return [Array<String>, nil]
+      def hosts
+        if has_hosts?
+          @hosts.split(",")
         end
       end
 
@@ -74,14 +77,14 @@ module Serverkit
         abort_with_errors unless recipe.valid?
       end
 
-      # @return [Serverkit::Recipe]
-      def recipe
-        @recipe ||= Loaders::RecipeLoader.new(recipe_path, variables_path: options[:variables]).load
+      # @return [Hash]
+      def ssh_options
+        @ssh_options || {}
       end
 
-      # @return [String, nil]
-      def recipe_path
-        @argv[1] or raise Errors::MissingRecipePathArgumentError
+      # @return [Serverkit::Recipe]
+      def recipe
+        @recipe ||= Loaders::RecipeLoader.new(@recipe_path, variables_path: @variables_path).load
       end
 
       # @param [String] host

data/lib/serverkit/command.rb

@@ -7,6 +7,8 @@ require "serverkit/errors/missing_recipe_path_argument_error"
 require "serverkit/errors/unknown_action_name_error"
 
 module Serverkit
+  # Command clsas takes care of command line interface.
+  # It builds and runs an Action object from given command line arguements.
   class Command
     # @param [Array<String>] argv
     def initialize(argv)
@@ -34,26 +36,62 @@ module Serverkit
 
     private
 
+    # @note #inspect is reserved ;(
+    def _inspect
+      Actions::Inspect.new(action_options).call
+    end
+
     # @return [String, nil]
     def action_name
       @argv.first
     end
 
+    # @return [Hash<Symbol => String>]
+    def action_options
+      {
+        hosts: hosts,
+        recipe_path: recipe_path,
+        variables_path: variables_path,
+      }.reject do |key, value|
+        value.nil?
+      end
+    end
+
     def apply
-      Actions::Apply.new(@argv).call
+      Actions::Apply.new(action_options).call
     end
 
     def check
-      Actions::Check.new(@argv).call
+      Actions::Check.new(action_options).call
     end
 
-    # @note #inspect is reserved ;(
-    def _inspect
-      Actions::Inspect.new(@argv).call
+    # @note This options are commonly used from all actions for now, however,
+    #   someday a new action that requires options might appear.
+    # @return [Slop]
+    def command_line_options
+      @command_line_options ||= Slop.parse!(@argv, help: true) do
+        banner "Usage: serverkit ACTION [options]"
+        on "--hosts=", "Pass hostname to execute command over SSH"
+        on "--variables=", "Path to variables file for ERB recipe"
+      end
+    end
+
+    # @return [String, nil]
+    def hosts
+      command_line_options[:hosts]
+    end
+
+    # @return [String]
+    def recipe_path
+      @argv[1] or raise Errors::MissingRecipePathArgumentError
     end
 
     def validate
-      Actions::Validate.new(@argv).call
+      Actions::Validate.new(action_options).call
+    end
+
+    def variables_path
+      command_line_options[:variables]
     end
   end
 end

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel