serverkit 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db65337119285c48fb7bee58c88a23c0b1955d21
-  data.tar.gz: a4706e05a71978f59554ee5172f51d29d46bde67
+  metadata.gz: 7db6fd563e5dbf53544681b4ebd016d80777252f
+  data.tar.gz: 6ce2ecbf513d1195d2a5237c8e763bba7441ccf9
 SHA512:
-  metadata.gz: b67a34cfbad4508a753890098b364421873e2a12c1c350c2b8860b1fb86cce59d479febfd778ffa9af85397dbc77949ac4bf55adf8f78f30690ca9029ce34301
-  data.tar.gz: c78471207691dab0b62163c42a2a0cb704ad052df44a74dc47b0c7676bb66736d08e149a5e264aae3df9d95dbb16aaf7dc4a1e3e84ac21c29a8efc7d305a8edb
+  metadata.gz: eeb144ad8a2543d8589e7e046f4bdc582b8b87945cbf696efbba214ce5ac4ea1d3e586bdf980453025708d123de9028cbfbfe31ea05b543efd7e0a3e465939b8
+  data.tar.gz: c977ff9b2708cdf095fad721865d8b371e8667672565fad33d52b04caa5e3ed4eeccdab2d502d0632410f15d134f5b3ec6c6a3f7efc16fd3d8f4b266f711f148

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.6
+- Fix bug on `service` resource
+
 ## 0.6.5
 - Use `sudo -H` option
 

data/doc/resource_git.md

@@ -5,6 +5,7 @@
 - path - where repository is cloned (required, type: `String`)
 - repository - repository URL (required, type: `String`)
 - state - whether it must be same revision with origin (`"cloned"` or `"updated"`, default: `"cloned"`)
+- branch - branch name (type: `String`)
 
 ## Example
 This recipe ensures a git repository is cloned from

data/lib/serverkit/resources/git.rb

@@ -8,16 +8,18 @@ module Serverkit
       attribute :path, required: true, type: String
       attribute :repository, required: true, type: String
       attribute :state, default: DEFAULT_STATE, inclusion: %w[cloned updated], type: String
+      attribute :branch, type: String
 
       # @note Override
       def apply
         _clone if clonable?
+        checkout if checkoutable?
         update if updatable?
       end
 
       # @note Override
       def check
-        has_git? && cloned? && !updatable?
+        has_git? && cloned? && !checkoutable? && !updatable?
       end
 
       private
@@ -35,6 +37,18 @@ module Serverkit
         check_command_from_identifier(:check_file_is_directory, git_path)
       end
 
+      def checkoutable?
+        branch && !checkouted?
+      end
+
+      def checkout
+        run_command("git -C #{path} checkout #{branch}")
+      end
+
+      def checkouted?
+        check_command("cd #{path} && test `git rev-parse HEAD` = `git rev-parse #{branch}`")
+      end
+
       # @return [String] Path to .git directory in the cloned repository
       def git_path
         ::File.join(path, ".git")
@@ -59,7 +73,7 @@ module Serverkit
       end
 
       def update
-        run_command("cd #{path} && git fetch origin && git reset --hard origin/master")
+        run_command("cd #{path} && git fetch origin && git reset --hard FETCH_HEAD")
       end
 
       def updated?

data/lib/serverkit/resources/service.rb

@@ -7,7 +7,7 @@ module Serverkit
 
       # @note Override
       def apply
-        run_command_from_identifier(:start, name)
+        run_command_from_identifier(:start_service, name)
       end
 
       # @note Override

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel