itamae 1.0.0.beta13 → 1.0.0.beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc9e5387ea9471a6357ec8d1d2fec041fd70bb2c
-  data.tar.gz: 250fa56a23f0d5450f1d9f24c733c4b52b570707
+  metadata.gz: 8a6d9038e892afddaf4c8d5dceef61585c59c730
+  data.tar.gz: 3529f616034dca772b32d629cecf7211e2b489de
 SHA512:
-  metadata.gz: d98ca86c23813146e2bcd9eaf3b519da859caf914fb61d9ce79c179b61c7144cac99c05957b948ceecac6c1942626b6455e8702c39b935c17b2f41fec7d47dbb
-  data.tar.gz: c48f5785e62f131cfe7509a811bb0ed256086f2bee6224412cf0a732f372acc9492e1d1758b9fa6a73112fb6eca5497fb0d3623ba1962867b54424ef664eeb14
+  metadata.gz: 73d9230854aa0bcfe65d173b2a0bdbb4a7a9aa9ea000447bbdca0c30d768453b6e83d64f102d23cb68cc27c13e544e5cd583ba7a2644c943039c260cd18bb7b8
+  data.tar.gz: f43d2bf1bc2d97d0cb7eab7130930f63d4edd1eba98ecbdeff8e62df071f4c95653fc0a3877a088cab8f3b2c3819681dcc44135e670a7cf616a5efbfadcecff7

data/lib/itamae/backend.rb

@@ -34,12 +34,24 @@ module Itamae
         command = commands
       end
 
+      cwd = options[:cwd]
+      if cwd
+        command = "cd #{Shellwords.escape(cwd)} && #{command}"
+      end
+
+      user = options[:user]
+      if user
+        command = "sudo -u #{Shellwords.escape(user)} -- /bin/sh -c #{Shellwords.escape(command)}"
+      end
+
+      Logger.debug "  Executing `#{command}`..."
+
       result = Specinfra::Runner.run_command(command)
       exit_status = result.exit_status
 
       if exit_status == 0 || !options[:error]
         method = :debug
-        message = "  Command `#{command}` exited with #{exit_status}"
+        message = "    exited with #{exit_status}"
       else
         method = :error
         message = "  Command `#{command}` failed. (exit status: #{exit_status})"

data/lib/itamae/cli.rb

@@ -4,6 +4,7 @@ require 'thor'
 module Itamae
   class CLI < Thor
     class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
+    class_option :color, type: :boolean, default: true
 
     def initialize(*args)
       super

data/lib/itamae/logger.rb

@@ -6,7 +6,8 @@ module Itamae
   module Logger
     class Formatter
       def call(severity, datetime, progname, msg)
-        "[%s] %s : %s\n" % [format_datetime(datetime), color("%5s" % severity, severity), msg2str(msg)]
+        severity = color("%5s" % severity, severity)
+        "[%s] %s : %s\n" % [format_datetime(datetime), severity, msg2str(msg)]
       end
 
       private

data/lib/itamae/recipe.rb

@@ -45,6 +45,8 @@ module Itamae
       klass = Resource.get_resource_class(method)
       resource = klass.new(self, name, &block)
       @dependencies << resource
+    rescue NameError
+      super
     end
 
     def include_recipe(target)

data/lib/itamae/resource.rb

@@ -10,6 +10,7 @@ require 'itamae/resource/mail_alias'
 require 'itamae/resource/service'
 require 'itamae/resource/link'
 require 'itamae/resource/local_ruby_block'
+require 'itamae/resource/git'
 
 module Itamae
   module Resource

data/lib/itamae/resource/base.rb

@@ -24,6 +24,7 @@ module Itamae
       end
 
       define_attribute :action, type: [Symbol, Array], required: true
+      define_attribute :user, type: String
 
       attr_reader :recipe
       attr_reader :resource_name
@@ -219,6 +220,12 @@ module Itamae
       end
 
       def run_command(*args)
+        unless args.last.is_a?(Hash)
+          args << {}
+        end
+
+        args.last[:user] ||= user
+
         backend.run_command(*args)
       end
 

data/lib/itamae/resource/git.rb

@@ -0,0 +1,56 @@
+require 'itamae'
+
+module Itamae
+  module Resource
+    class Git < Base
+      DEPLOY_BRANCH = "deploy"
+
+      define_attribute :action, default: :sync
+      define_attribute :destination, type: String, default_name: true
+      define_attribute :repository, type: String, required: true
+      define_attribute :revision, type: String
+
+      def sync_action
+        ensure_git_available
+
+        if run_specinfra(:check_file_is_directory, destination)
+          run_command_in_repo(['git', 'fetch', 'origin'])
+        else
+          run_command(['git', 'clone', repository, destination])
+        end
+
+        target_revision =
+          revision ||
+          run_command_in_repo("git ls-remote origin HEAD | cut -f1").stdout.strip
+
+        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])
+
+        if deploy_old_created
+          run_command_in_repo("git branch -d deploy-old")
+        end
+      end
+
+      private
+      def ensure_git_available
+        unless run_command("which git", error: false).exit_status == 0
+          raise "`git` command is not available. Please install git."
+        end
+      end
+
+      def run_command_in_repo(*args)
+        run_command(*args, cwd: destination)
+      end
+
+      def current_branch
+        run_command_in_repo("git rev-parse --abbrev-ref HEAD").stdout.strip
+      end
+    end
+  end
+end
+

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta13
+1.0.0.beta14

data/spec/integration/default_spec.rb

@@ -78,3 +78,13 @@ describe file('/tmp-link') do
     expect(subject.content.lines.size).to eq 0
   end
 end
+
+describe command('cd /tmp/git_repo && git rev-parse HEAD') do
+  its(:stdout) { should match(/3116e170b89dc0f7315b69c1c1e1fd7fab23ac0d/) }
+end
+
+describe file('/tmp/created_by_itamae_user') do
+  it { should be_file }
+  it { should be_owned_by 'itamae' }
+end
+

data/spec/integration/recipes/default.rb

@@ -128,3 +128,18 @@ local_ruby_block "greeting" do
   end
 end
 
+#####
+
+package "git"
+
+git "/tmp/git_repo" do
+  repository "https://github.com/ryotarai/infrataster.git"
+  revision "v0.1.0"
+end
+
+#####
+
+execute "echo Hello > /tmp/created_by_itamae_user" do
+  user "itamae"
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta13
+  version: 1.0.0.beta14
 platform: ruby
 authors:
 - Ryota Arai
@@ -164,6 +164,7 @@ files:
 - lib/itamae/resource/directory.rb
 - lib/itamae/resource/execute.rb
 - lib/itamae/resource/file.rb
+- lib/itamae/resource/git.rb
 - lib/itamae/resource/link.rb
 - lib/itamae/resource/local_ruby_block.rb
 - lib/itamae/resource/mail_alias.rb