itamae 1.0.0.beta20 → 1.0.0.beta21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9705a019e13d9320346971b46f96c1b70e6c14a0
-  data.tar.gz: 81370a0601b58e8380f8c75ef01213d879ff1192
+  metadata.gz: 696b6b9d0d4dde941a436b0cab7a717ad510740a
+  data.tar.gz: d06f0329589a1cb8bf19c5f99e68e4ab7edb91ed
 SHA512:
-  metadata.gz: ea6ff64ecb88de843eac1306076b28bee27420b0b02b4c2f770f15c56bdfbff075b25fa8dd5c3c8c0498c5d3b7cefdda6eb454ace64cd48a2535e42b534e5787
-  data.tar.gz: dbaf91ed18cf422c6f56ad4d98daf529ac2d6168edc3b6d6b20c0124c67ee66f7a56e54239632ad3370fddebec23609ed892b61f3a7726b8c3b7f34a8812f727
+  metadata.gz: 7222275191cb7581380abe17733226854fc37024bbc0d3f6c7e1654240ffccc6def6adddaaab8408a2abe6b595485e64aa46e9f18ec1878b008d0945f238737c
+  data.tar.gz: 3c65feb51906ffe4cc552b4f940ffcfdf359a805a948a70fda21ad012d8c757fea61961a2bb434a3be216b4d05f27f6e433ccb88c5b11c98d8ae79b117b34244

data/lib/itamae/backend.rb

@@ -1,5 +1,17 @@
 require 'specinfra'
 require 'singleton'
+require 'io/console'
+
+module Specinfra
+  module Configuration
+    def self.sudo_password
+      return @sudo_password if @sudo_password
+
+      print "sudo password: "
+      @sudo_password = STDIN.noecho(&:gets).strip
+    end
+  end
+end
 
 module Itamae
   class Backend

data/lib/itamae/resource/git.rb

@@ -15,21 +15,11 @@ module Itamae
         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
@@ -44,7 +34,13 @@ module Itamae
           new_repository = true
         end
 
-        if new_repository || @attributes[:revision_hash] != get_revision('HEAD')
+        target = if revision
+                   get_revision(revision)
+                 else
+                   run_command_in_repo("git ls-remote origin HEAD | cut -f1").stdout.strip
+                 end
+
+        if new_repository || target != get_revision('HEAD')
           updated!
 
           deploy_old_created = false
@@ -53,7 +49,7 @@ module Itamae
             deploy_old_created = true
           end
 
-          run_command_in_repo(["git", "checkout", @attributes[:revision_hash], "-b", DEPLOY_BRANCH])
+          run_command_in_repo(["git", "checkout", target, "-b", DEPLOY_BRANCH])
 
           if deploy_old_created
             run_command_in_repo("git branch -d deploy-old")

data/lib/itamae/resource/link.rb

@@ -15,7 +15,7 @@ module Itamae
       end
 
       def set_current_attributes
-        @current_attributes[:exist?] = (run_command(["test", "-L", link]).exit_status == 0)
+        @current_attributes[:exist?] = (run_command(["test", "-L", link], error: false).exit_status == 0)
 
         if @current_attributes[:exist?]
           @current_attributes[:to] = run_command(["readlink", "-f", link]).stdout.strip

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta20
+1.0.0.beta21

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta20
+  version: 1.0.0.beta21
 platform: ruby
 authors:
 - Ryota Arai