scm_workspace 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99dc52c5c303b85855a5926f2f2be19af620b793
-  data.tar.gz: 15b8d698f5d4a5d7d4970158093309472d635e13
+  metadata.gz: 6a6ca321bae08aaafea7d717e1807f8d22f79945
+  data.tar.gz: c49506dc81028ed0052301b4b69e8549e972655c
 SHA512:
-  metadata.gz: 0a09fe9bf444998f0bafa1c702aa6f4a9cb9b90e0c760dc2aa349abee70392df00fc3f2d9a99dfeca0e3c7b85d74555d301f4c731e851850c8d34545de06e217
-  data.tar.gz: d223c163a460ea1d96efb6e3afdf747c4f853debcb332fe8a41061c61d4517a0a82cd79915e68525795c793733c62bdef3571c4ab70e5c837ba560f99bee70a6
+  metadata.gz: 4aad7efa2ec7fb4db8298c3d65de9be0413a0a6bbf04ade013c5b4ec9a7e7c47074dccc28bca0eb59ff63014cf9ed8dfd04122cebe535623a8f72079cc0dbfcb
+  data.tar.gz: 2bc81ed0c8769892b8e8c0e4ea915891ea630b3747c39dca282bd0d50f56806c5932035fb20589472d030b32e2643c7c5c4d76cc08319176b8ba48b8ab3fcbd2

data/lib/scm_workspace/core_ext/fileutils.rb

@@ -0,0 +1,44 @@
+require 'fileutils'
+require 'logger'
+
+module FileUtils
+
+  class << self
+    def with_logger(logger, level = :info)
+      output = LoggerAdapter.new(logger, level)
+
+      Module.new do
+        include FileUtils
+        @fileutils_output  = output
+        @fileutils_label   = ''
+
+        ::FileUtils.collect_method(:verbose).each do |name|
+          module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+            def #{name}(*args)
+              super(*fu_update_option(args, :verbose => true))
+            end
+            private :#{name}
+          EOS
+        end
+
+        extend self
+        class << self
+          ::FileUtils::METHODS.each do |m|
+            public m
+          end
+        end
+      end
+
+    end
+  end
+
+  class LoggerAdapter
+    def initialize(logger, level)
+      @logger, @level = logger, level
+    end
+    def puts(msg)
+      @logger.send(@level, msg)
+    end
+  end
+
+end

data/lib/scm_workspace/version.rb

@@ -1,3 +1,3 @@
 class ScmWorkspace
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/scm_workspace.rb

@@ -7,6 +7,7 @@ require 'tengine/support/core_ext/hash/deep_dup'
 require 'tengine/support/null_logger'
 
 require "scm_workspace/version"
+require "scm_workspace/core_ext/fileutils"
 
 class ScmWorkspace
 
@@ -28,9 +29,8 @@ class ScmWorkspace
     @logger ||= Tengine::Support::NullLogger.new
   end
 
-  def puts_info(msg)
-    logger.info(msg)
-    $stdout.puts(msg) if verbose
+  def fileutils
+    @fileutils ||= FileUtils.with_logger(logger)
   end
 
   def system!(cmd)
@@ -44,8 +44,11 @@ class ScmWorkspace
     end
 
     if $?.exitstatus == 0
-      logger.info("\e[33mSUCCESS: %s\e[0m" % cmd)
-      return buf.join
+      msg = "\e[33mSUCCESS: %s\e[0m" % cmd
+      r = buf.join
+      msg << "\n" << r.strip if verbose
+      logger.info(msg)
+      return r
     else
       msg = "\e[31mFAILURE: %s\n%s\e[0m" % [cmd, buf.join.strip]
       logger.error(msg)
@@ -54,7 +57,9 @@ class ScmWorkspace
   end
 
   def system_at_root!(cmd)
-    Dir.chdir(root){ system!(cmd) }
+    fileutils.chdir(root) do
+      return system!(cmd)
+    end
   end
 
   def configure(url)
@@ -71,12 +76,11 @@ class ScmWorkspace
       logger.info("SCM configure")
       system!("git clone #{url} #{repo_dir} #{opt}")
     when :svn then
-      Dir.chdir(@root) do
+      fileutils.chdir(@root) do
         cmd = "git svn clone #{url} #{repo_dir} #{opt}"
         cmd << " > /dev/null 2>&1" unless verbose
         logger.info("*" * 100)
         logger.info("SCM configure")
-        puts_info "cd #{@root} && " + cmd
         system(cmd)
       end
     else
@@ -86,10 +90,10 @@ class ScmWorkspace
 
   def clear
     return unless Dir.exist?(repo_dir)
-    Dir.chdir(repo_dir) do
+    fileutils.chdir(repo_dir) do
       (Dir.glob("*") + Dir.glob(".*")).each do |d|
         next if d =~ /\A\.+\Z/
-        FileUtils.remove_entry_secure(d)
+        fileutils.remove_entry_secure(d)
       end
     end
   end
@@ -123,7 +127,6 @@ class ScmWorkspace
     logger.info("-" * 100)
     case scm_type
     when :git then
-      # puts_info("git status")
       status_text = system_at_root!("git status") # in_repo_dir{ `git status` }
       value = status_text.scan(/Your branch is behind 'origin\/#{current_branch_name}' by (\d+\s+commits)/)
       if value && !value.empty?
@@ -217,7 +220,7 @@ class ScmWorkspace
 
   def git_current_branch_name(dir = repo_dir)
     return nil unless Dir.exist?(dir)
-    Dir.chdir(dir) do
+    fileutils.chdir(dir) do
       # http://qiita.com/sugyan/items/83e060e895fa8ef2038c
       result = `git symbolic-ref --short HEAD`.strip
       return result unless result.nil? || result.empty?
@@ -313,7 +316,7 @@ class ScmWorkspace
   end
 
   def in_root
-    Dir.chdir(repo_dir) do
+    fileutils.chdir(repo_dir) do
       return yield
     end
   end

data/scm_workspace.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
 
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-debugger"
   spec.add_development_dependency "fuubar"
 end

data/spec/scm_workspace/core_ext/fileutils_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+require 'scm_workspace/core_ext/fileutils'
+require "stringio"
+require "tmpdir"
+
+describe FileUtils do
+
+  let(:io){ StringIO.new }
+  let(:logger){ Logger.new(io) }
+  let(:fu){ FileUtils.with_logger(logger) }
+
+  describe :chdir do
+    it "default" do
+      dir = File.expand_path("../..", __FILE__)
+      fu.chdir(dir) do
+        fu.pwd.should == dir
+      end
+      io.rewind
+      lines = io.read.lines
+      lines.length.should == 2
+      lines[0].should =~ /\AI, \[.+\]\s+INFO -- : cd #{Regexp.escape(dir)}/
+      lines[1].should =~ /\AI, \[.+\]\s+INFO -- : cd -/
+    end
+
+    it "debug" do
+      debug_fu = FileUtils.with_logger(logger, :debug)
+      dir = File.expand_path("../..", __FILE__)
+      debug_fu.chdir(dir) do
+        debug_fu.pwd.should == dir
+      end
+      io.rewind
+      lines = io.read.lines
+      lines.length.should == 2
+      lines[0].should =~ /\AD, \[.+\]\s+DEBUG -- : cd #{Regexp.escape(dir)}/
+      lines[1].should =~ /\AD, \[.+\]\s+DEBUG -- : cd -/
+    end
+  end
+
+  describe :mkdir_p do
+    it "default" do
+      path = nil
+      Dir.mktmpdir do |dir|
+        path = File.join(dir, "foo/bar")
+        fu.mkdir_p(path)
+        Dir.exist?(path).should be_true
+      end
+      io.rewind
+      lines = io.read.lines
+      lines.length.should == 1
+      lines[0].should =~ /\AI, \[.+\]\s+INFO -- : mkdir -p #{Regexp.escape(path)}/
+    end
+  end
+
+  describe :touch do
+    it "default" do
+      path = nil
+      Dir.mktmpdir do |dir|
+        path = File.join(dir, "restart.txt")
+        fu.touch(path)
+        File.exist?(path).should be_true
+        IO.read(path).should == ""
+      end
+      io.rewind
+      lines = io.read.lines
+      lines.length.should == 1
+      lines[0].should =~ /\AI, \[.+\]\s+INFO -- : touch #{Regexp.escape(path)}/
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scm_workspace
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tengine_support
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +137,10 @@ files:
 - README.md
 - Rakefile
 - lib/scm_workspace.rb
+- lib/scm_workspace/core_ext/fileutils.rb
 - lib/scm_workspace/version.rb
 - scm_workspace.gemspec
+- spec/scm_workspace/core_ext/fileutils_spec.rb
 - spec/scm_workspace_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -152,6 +168,7 @@ signing_key:
 specification_version: 4
 summary: support loading scm repogitory into local workspace
 test_files:
+- spec/scm_workspace/core_ext/fileutils_spec.rb
 - spec/scm_workspace_spec.rb
 - spec/spec_helper.rb
 has_rdoc: