serverkit 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b1a7f09683dac690655e350246e3fbc41990ec
-  data.tar.gz: 9e2d91038579c643adb83b4f7b54d4a3ceb710d1
+  metadata.gz: b3236f3d4ad0dbab87e87f35c9afbdb165591f1c
+  data.tar.gz: 3374bf2a87f000bf63358af4b5e40dc0051d086a
 SHA512:
-  metadata.gz: 048688e2239eb404e45f5b9a20223fd6070de9498c43b857b13b077d16159e822c618789b33c9e2e1243f6c48c0521e91fdddad7e96b7158869cc48b46750ddc
-  data.tar.gz: 899ff30583a83955b4e85b5b805e9db01e0f430f1ed6700e28443115e76bd82ab7c475c9b37910985b67a8ce7de205952aef01abee5ebc3ae55a4829976c40d9
+  metadata.gz: 163de635af19fdffa01010cf04c8bce58a5876789343a265aa0d641e60e1b04e8037840df5729c89ddf03dd57e34552a3a48a70379beefdec2782600b7a2a533
+  data.tar.gz: 8866a193ae71db7d4f97bf71e01258f8ff04f615a0392ba6177abcfd2bb85e876fb84e9d1e421d501d082c79339533aa9b63b70365d1e3793f619fa75aeeb536

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.2
+- Change action name: `serverkit diff` -> `serverkit check`
+- Load gems from Gemfile before running action
+
 ## 0.2.1
 - Change action name: `serverkit check` -> `serverkit diff`
 
@@ -36,4 +40,4 @@
 
 ## 0.0.1
 - 1st Release on 2015-03-30
-- Support `serverkit diff` and `serverkit apply` actions
+- Support `serverkit check` and `serverkit apply` actions

data/README.md

@@ -2,7 +2,7 @@
 Configuration management toolkit for IT automation.
 
 ## Usage
-Write a recipe, then run `serverkit` executable to validate, inspect, diff, and apply the recipe.
+Write a recipe, then run `serverkit` executable to validate, inspect, check, and apply the recipe.
 
 ### serverkit validate
 Validates recipe schema, resources, and attributes.
@@ -57,11 +57,11 @@ $ serverkit inspect recipe.yml
 }
 ```
 
-### serverkit diff
+### serverkit check
 Shows the difference between your recipe and the state of the target host.
 
 ```
-$ serverkit diff recipe.yml
+$ serverkit check recipe.yml
 [ OK ] install_mysql
 [ OK ] install_redis
 [ OK ] install_licecap

data/lib/serverkit/actions/apply.rb

@@ -9,11 +9,11 @@ module Serverkit
           Thread.new do
             recipe.resources.map(&:dup).each do |resource|
               resource.backend = backend
-              if resource.diff
+              if resource.check
                 puts "[SKIP] #{resource.id} on #{host_for(backend)}"
               else
                 resource.apply
-                result = resource.diff ? "DONE" : "FAIL"
+                result = resource.check ? "DONE" : "FAIL"
                 puts "[#{result}] #{resource.id} on #{host_for(backend)}"
               end
             end

data/lib/serverkit/actions/base.rb

@@ -1,3 +1,4 @@
+require "bundler"
 require "etc"
 require "net/ssh"
 require "serverkit/errors/missing_recipe_path_argument_error"
@@ -50,6 +51,10 @@ module Serverkit
         end
       end
 
+      def bundle
+        Bundler.require(:default)
+      end
+
       def hosts
         options[:hosts].split(",")
       end
@@ -70,6 +75,7 @@ module Serverkit
       end
 
       def setup
+        bundle
         abort_with_errors unless recipe.valid?
       end
 

data/lib/serverkit/actions/{diff.rb → check.rb}

@@ -3,13 +3,13 @@ require "thread"
 
 module Serverkit
   module Actions
-    class Diff < Base
+    class Check < Base
       def run
         backends.map do |backend|
           Thread.new do
             recipe.resources.map(&:dup).each do |resource|
               resource.backend = backend
-              result = resource.diff ? "OK" : "NG"
+              result = resource.check ? "OK" : "NG"
               puts "[ #{result} ] #{resource.id} on #{host_for(backend)}"
             end
           end

data/lib/serverkit/command.rb

@@ -1,5 +1,5 @@
 require "serverkit/actions/apply"
-require "serverkit/actions/diff"
+require "serverkit/actions/check"
 require "serverkit/actions/inspect"
 require "serverkit/actions/validate"
 require "serverkit/errors/missing_action_name_argument_error"
@@ -19,8 +19,8 @@ module Serverkit
         raise Errors::MissingActionNameArgumentError
       when "apply"
         apply
-      when "diff"
-        diff
+      when "check"
+        check
       when "inspect"
         _inspect
       when "validate"
@@ -43,8 +43,8 @@ module Serverkit
       Actions::Apply.new(@argv).call
     end
 
-    def diff
-      Actions::Diff.new(@argv).call
+    def check
+      Actions::Check.new(@argv).call
     end
 
     # @note #inspect is reserved ;(

data/lib/serverkit/resources/file.rb

@@ -16,7 +16,7 @@ module Serverkit
       end
 
       # @return [true, false]
-      def diff
+      def check
         has_file? && has_same_content? && has_valid_group? && has_valid_owner?
       end
 

data/lib/serverkit/resources/git.rb

@@ -15,7 +15,7 @@ module Serverkit
       end
 
       # @return [true, false]
-      def diff
+      def check
         has_git? && cloned? && !updatable?
       end
 

data/lib/serverkit/resources/homebrew_cask.rb

@@ -10,7 +10,7 @@ module Serverkit
       end
 
       # @return [true, false]
-      def diff
+      def check
         check_command("/usr/local/bin/brew cask list -1 | grep -E '^#{name}$'")
       end
     end

data/lib/serverkit/resources/package.rb

@@ -10,7 +10,7 @@ module Serverkit
       end
 
       # @return [true, false]
-      def diff
+      def check
         check_command_from_identifier(:check_package_is_installed, name)
       end
     end

data/lib/serverkit/resources/service.rb

@@ -9,7 +9,7 @@ module Serverkit
         run_command_from_identifier(:start, name)
       end
 
-      def diff
+      def check
         check_command_from_identifier(:check_service_is_running, name)
       end
     end

data/lib/serverkit/resources/symlink.rb

@@ -11,7 +11,7 @@ module Serverkit
       end
 
       # @return [true, false]
-      def diff
+      def check
         check_command_from_identifier(:check_file_is_linked_to, source, destination)
       end
     end

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/serverkit.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activemodel"
   spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "bundler"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "highline"
   spec.add_runtime_dependency "slop", "~> 3.4"
   spec.add_runtime_dependency "specinfra"
-  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "pry", "0.10.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "3.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ files:
 - lib/serverkit.rb
 - lib/serverkit/actions/apply.rb
 - lib/serverkit/actions/base.rb
-- lib/serverkit/actions/diff.rb
+- lib/serverkit/actions/check.rb
 - lib/serverkit/actions/inspect.rb
 - lib/serverkit/actions/validate.rb
 - lib/serverkit/command.rb