itamae 1.0.0.beta18 → 1.0.0.beta19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6407849af1c1881162cdce67e8312ad543f5b80
-  data.tar.gz: fa1d01ec1165d160b643671a719bebb49cba93f0
+  metadata.gz: dc6be533641d1880daf19c72aa07fd17819862c1
+  data.tar.gz: 0216f0b6a3a46479b0cf04071473285ef784d289
 SHA512:
-  metadata.gz: e8a4f249629869ce532e457c8f9878db2915eadb99ba5acbfde9ae01d93197102badaa2d0ae98c5ab34b39b1c4bc6b6f005b8a38ee132fcec2d96ce1914e1280
-  data.tar.gz: 00a927b247a787b915f940c95b867c7bff45809997e947426d26e7574c0387b16893d210bf57c0c35183ac4e9dcc4a5051063f9fe0c5a09303e8a0aa6d77d581
+  metadata.gz: b09eb043ac66fb22012bd925abf26be0b55038d8838bc4c9804249729acc6f6c809321bcd8b8f26274637f0784618fe47d9f5062b0945b3e3243b5d2198d3bb8
+  data.tar.gz: 8adc9ff795714ab8eedcee4ddd0a8ac5588f7571f0f67374b42506566a54577959f29eda5538b06fb0fe964269e87ea000912877067a53e963bb7c3d240a8f98

data/lib/itamae/resource/git.rb

@@ -10,34 +10,54 @@ module Itamae
       define_attribute :repository, type: String, required: true
       define_attribute :revision, type: String
 
+      def pre_action
+        case action
+        when :sync
+          @attributes[:exist?] = true
+        end
+
+        @attributes[:revision_hash] = if revision
+                                        get_revision(revision)
+                                      else
+                                        run_command_in_repo("git ls-remote origin HEAD | cut -f1").stdout.strip
+                                      end
+      end
+
+      def set_current_attributes
+        exist = run_specinfra(:check_file_is_directory, destination)
+        @current_attributes[:exist?] = exist
+
+        if exist
+          @current_attributes[:revision_hash] = get_revision('HEAD')
+        end
+      end
+
       def sync_action
         ensure_git_available
 
+        new_repository = false
+
         if run_specinfra(:check_file_is_directory, destination)
           run_command_in_repo(['git', 'fetch', 'origin'])
         else
           run_command(['git', 'clone', repository, destination])
-          updated!
+          new_repository = true
         end
 
-        target_revision =
-          get_revision(revision) ||
-          run_command_in_repo("git ls-remote origin HEAD | cut -f1").stdout.strip
-
-        unless target_revision == get_revision('HEAD')
+        if new_repository || @attributes[:revision_hash] != get_revision('HEAD')
           updated!
-        end
 
-        deploy_old_created = false
-        if current_branch == DEPLOY_BRANCH
-          run_command_in_repo("git branch -m deploy-old")
-          deploy_old_created = true
-        end
+          deploy_old_created = false
+          if current_branch == DEPLOY_BRANCH
+            run_command_in_repo("git branch -m deploy-old")
+            deploy_old_created = true
+          end
 
-        run_command_in_repo(["git", "checkout", target_revision, "-b", DEPLOY_BRANCH])
+          run_command_in_repo(["git", "checkout", @attributes[:revision_hash], "-b", DEPLOY_BRANCH])
 
-        if deploy_old_created
-          run_command_in_repo("git branch -d deploy-old")
+          if deploy_old_created
+            run_command_in_repo("git branch -d deploy-old")
+          end
         end
       end
 

data/lib/itamae/resource/link.rb

@@ -7,8 +7,23 @@ module Itamae
       define_attribute :link, type: String, default_name: true
       define_attribute :to, type: String, required: true
 
+      def pre_action
+        case action
+        when :create
+          @attributes[:exist?] = true
+        end
+      end
+
+      def set_current_attributes
+        @current_attributes[:exist?] = (run_command(["test", "-L", link]).exit_status == 0)
+
+        if @current_attributes[:exist?]
+          @current_attributes[:to] = run_command(["readlink", "-f", link]).stdout.strip
+        end
+      end
+
       def create_action
-        if ! run_specinfra(:check_file_is_linked_to, link, to)
+        unless run_specinfra(:check_file_is_linked_to, link, to)
           run_specinfra(:link_file_to, link, to)
         end
       end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta18
+1.0.0.beta19

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta18
+  version: 1.0.0.beta19
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor