scm_workspace 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ac4b9cb8fab6cd2716ff82c394f3eead8971fd
-  data.tar.gz: 0fee11858529095260f03525e02d952ebe29795a
+  metadata.gz: c387c99f98b27629fa7718d82dcfc15f586673ce
+  data.tar.gz: e81f9659b83c087db6413db421ea4b8cb1453e14
 SHA512:
-  metadata.gz: f2ab9c11918f4c041415c71647d00ab1f5786c66efdc21f14e874798729f176c9203669f164468215f6aed6828fa244a98c1e47a6fc0c127512e2e21126ecd07
-  data.tar.gz: ba09fa538e136d72d98db7950be8de52ef49136e935c9302312cb4a4233d8673b28d0f27c0a18871dac121b1c4b00cd7850373b69f8b8dbd5db8c45399ede287
+  metadata.gz: 48b7feb1d23397737c314eabac700121d87ed9a0dead394edd8be41936107275876e01e7615ef7427963199571a012529feb07cf58b91cd8c0956a6f79a2036f
+  data.tar.gz: afd711128955f9c4361d90531a9b8ec6fa46768cb6a72d9da7a885254dd504db6e6a9c267c8ef288bdae65b345e3b490dc3383c206b0ba2463efbe4165dc2f9d

data/lib/scm_workspace/version.rb

@@ -1,3 +1,3 @@
 class ScmWorkspace
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/scm_workspace.rb

@@ -12,9 +12,13 @@ class ScmWorkspace
 
   attr_reader :root
   attr_writer :logger
+  attr_accessor :svn_branch_prefix
+  attr_accessor :verbose
   def initialize(config, options = {})
     @root = config[:workspace]
     @logger = options[:logger]
+    @verbose = options[:verbose] || (ENV["VERBOSE"] =~ /true|yes|on/)
+    @svn_branch_prefix = options[:svn_branch_prefix] || ENV["SVN_BRANCH_PREFIX"] || "branches"
   end
 
   def logger
@@ -23,17 +27,17 @@ class ScmWorkspace
 
   def puts_info(msg)
     logger.info(msg)
-    $stdout.puts(msg)
+    $stdout.puts(msg) if verbose
   end
 
   def configure(url)
-    raise "#{repo_dir} is not empty. You must clear it" if configured?
-    FileUtils.mkdir_p(root)
+    if configured?
+      msg = "#{repo_dir} is not empty. You must clear it"
+      msg << "\nls -la #{repo_dir}" << `ls -la #{repo_dir}` if verbose
+      raise msg
+    end
     url, opt = url.split(/\s+/, 2)
     scm_type = self.class.guess_scm_type(url)
-    options = opt ? parse_options(opt, scm_type) : {}
-    options['url'] = url
-    save_options(options)
     case scm_type
     when :git then
       logger.info("*" * 100)
@@ -43,7 +47,8 @@ class ScmWorkspace
       @git = Git.clone(url, repo_dir)
     when :svn then
       Dir.chdir(@root) do
-        cmd = "git svn clone #{url} #{repo_dir} #{opt} > /dev/null 2>&1"
+        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
@@ -56,8 +61,13 @@ class ScmWorkspace
   end
 
   def clear
-    FileUtils.remove_entry_secure(repo_dir) if Dir.exist?(repo_dir)
-    FileUtils.rm(options_path) if File.exist?(options_path)
+    return unless Dir.exist?(repo_dir)
+    Dir.chdir(repo_dir) do
+      (Dir.glob("*") + Dir.glob(".*")).each do |d|
+        next if d =~ /\A\.+\Z/
+        FileUtils.remove_entry_secure(d)
+      end
+    end
   end
 
   def checkout(branch_name)
@@ -169,20 +179,39 @@ class ScmWorkspace
   def current_branch_name
     return nil unless configured?
     case scm_type
-    when :git then
-      logger.info("-" * 100)
-      r = git.log.first.name
-      logger.info("current_branch_name: #{r.inspect}")
-      r
-    when :svn then
-      info = svn_info
-      r = info[:url].sub(info[:repository_root], '')
-      r.sub!(/\A\//, '')
-      if branch_prefix = load_options['branches']
-        r.sub!(branch_prefix + "/", '')
-      end
-      r
+    when :git then git_current_branch_name
+    when :svn then svn_current_branch_name
+    end
+  end
+
+  def git_current_branch_name(dir = repo_dir)
+    return nil unless Dir.exist?(dir)
+    Dir.chdir(dir) do
+      # http://qiita.com/sugyan/items/83e060e895fa8ef2038c
+      result = `git symbolic-ref --short HEAD`.strip
+      return result unless result.nil? || result.empty?
+      result = `git status`.scan(/On branch\s*(.+)\s*$/).flatten.first
+      return result unless result.nil? || result.empty?
+      work = `git log --decorate -1`.scan(/^commit\s[0-9a-f]+\s\((.+)\)/).
+        flatten.first.split(/,/).map(&:strip).reject{|s| s =~ /HEAD\Z/}
+      r = work.select{|s| s =~ /origin\//}.first
+      r ||= work.first
+      result = r.sub(/\Aorigin\//, '')
+      return result
     end
+  rescue => e
+    # puts "[#{e.class}] #{e.message}"
+    # puts "Dir.pwd: #{Dir.pwd}"
+    # puts "git status\n" << `git status`
+    raise e
+  end
+
+  def svn_current_branch_name
+    info = svn_info
+    r = info[:url].sub(info[:repository_root], '')
+    r.sub!(/\A\//, '')
+    r.sub!(svn_branch_prefix + "/", '')
+    r
   end
 
   def current_tag_names
@@ -193,15 +222,11 @@ class ScmWorkspace
 
 
   def repo_dir
-    File.join(@root, "workspace")
-  end
-
-  def options_path
-    File.join(@root, "options.yml")
+    @root
   end
 
   def configured?
-    Dir.exist?(repo_dir)
+    Dir.exist?(File.join(repo_dir, ".git"))
   end
 
   def cleared?
@@ -236,32 +261,6 @@ class ScmWorkspace
     }
   }
 
-  def parse_options(opt, scm_type)
-    # "-T trunk --branches branches --tags tags -hoge --on" という文字列を
-    #   [["-T", "trunk"], ["--branches", "branches"], ["--tags", "tags"], ["-hoge", nil], ["--on", nil]]
-    # という風に分割します
-    key_values = opt.scan(/(-[^\s]+)(?:\=|\s+)?([^-][^\s]+)?/)
-    result = key_values.each_with_object({}){|(k,v), d| d[k.sub(/\A-{1,2}/, '').gsub(/-/, '_')] = v }
-    CONFIGURE_OPTIONS[scm_type].each do |short_key, long_key|
-      if v = result.delete(short_key)
-        result[long_key] = v
-      end
-    end
-    result
-  end
-
-  def save_options(hash)
-    open(options_path, "w") do |f|
-      YAML.dump(hash, f)
-    end
-  end
-
-  def load_options
-    return {} unless File.readable?(options_path)
-    YAML.load_file(options_path)
-  end
-  alias_method :options, :load_options
-
   def git_repo?
     return nil unless configured?
     !git.remotes.empty? rescue false

data/scm_workspace.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.11.0"
+  spec.add_development_dependency "rspec"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "fuubar"

data/spec/scm_workspace_spec.rb

@@ -7,27 +7,27 @@ require 'fileutils'
 # ApiServerモードでもScmWorkspaceクラスを使用するので、参照だけはできることを確認する。
 describe ScmWorkspace do
 
-  before(:all){ @tmp_workspace = Dir.mktmpdir }
+  before(:all) do
+    @tmp_workspace = Dir.mktmpdir
+    @scm_workspace = ScmWorkspace.new(workspace: File.join(@tmp_workspace, "workspace"))
+  end
   after(:all){ FileUtils.remove_entry_secure(@tmp_workspace) }
-  let(:tmp_workspace){ @tmp_workspace }
-  let(:scm_workspace){ ScmWorkspace.new(workspace: tmp_workspace) }
 
   context "not depend on git" do
-    subject{ scm_workspace }
+    subject{ @scm_workspace }
     its(:repo_dir){ should_not == nil }
-    its(:options_path){ should_not == nil }
     it{ subject.configured? }
     it{ subject.cleared? }
   end
 
   context "git", git: true do
-    let(:url){ "git://github.com/akm/git_sandbox.git" }
+    before(:all){ @url = "git://github.com/akm/git_sandbox.git" }
 
     context "before configuring" do
       before do
-        FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
+        @scm_workspace.clear
       end
-      subject{ scm_workspace }
+      subject{ @scm_workspace }
 
       its(:configured?){ should == false}
       its(:scm_type){ should == nil}
@@ -48,15 +48,14 @@ describe ScmWorkspace do
 
     context "after configuring" do
       before(:all) do
-        FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-        scm_workspace.configure(url)
+        @scm_workspace.clear
+        @scm_workspace.configure(@url)
       end
-      subject{ scm_workspace }
+      subject{ @scm_workspace }
 
-      its(:options){ should == {"url" => url} }
       its(:configured?){ should == true}
       its(:cleared?){ should == false }
-      its(:url){ should == url }
+      its(:url){ should == @url }
 
       its(:scm_type){ should == :git}
       its(:git_repo?){ should == true }
@@ -71,13 +70,13 @@ describe ScmWorkspace do
       its(:current_commit_key){ should == "a0eaf8cca31080ca26edbae0daddaa9931edd6d6" }
 
       it :fetch do
-        scm_workspace.fetch
+        @scm_workspace.fetch
       end
 
       context "duplicated configuration" do
         it do
           expect{
-            scm_workspace.configure(url)
+            @scm_workspace.configure(@url)
           }.to raise_error(/not empty/i)
         end
       end
@@ -86,28 +85,28 @@ describe ScmWorkspace do
     describe :checkout do
       context "another branch" do
         before(:all) do
-          FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-          scm_workspace.configure(url)
-          scm_workspace.checkout("0.1")
+          @scm_workspace.clear
+          @scm_workspace.configure(@url)
+          @scm_workspace.checkout("0.1")
         end
-        subject{ scm_workspace }
+        subject{ @scm_workspace }
         its(:current_branch_name){ should == "0.1" }
         its(:current_tag_names){ should =~ %w[v0.1.0] }
       end
 
       context "branch is updated" do
         before(:all) do
-          FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-          scm_workspace.configure(url)
-          Dir.chdir(scm_workspace.repo_dir) do
+          @scm_workspace.clear
+          @scm_workspace.configure(@url)
+          Dir.chdir(@scm_workspace.repo_dir) do
             # バージョンを巻き戻す
             system("git reset --hard a68a53610407e6ba30939326af743d3b734bb53d")
           end
         end
         it "checkout again" do
-          scm_workspace.status.should =~ /7 commits/
-          scm_workspace.checkout("develop")
-          scm_workspace.status.should =~ /up-to-dated/
+          @scm_workspace.status.should =~ /7 commits/
+          @scm_workspace.checkout("develop")
+          @scm_workspace.status.should =~ /up-to-dated/
         end
       end
     end
@@ -116,24 +115,24 @@ describe ScmWorkspace do
       %w[v0.0.1 v0.0.2 v0.1.0].each do |tag|
         context "#{tag} in develop" do
           before(:all) do
-            FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-            scm_workspace.configure(url)
-            scm_workspace.checkout("develop")
-            scm_workspace.move(tag)
+            @scm_workspace.clear
+            @scm_workspace.configure(@url)
+            @scm_workspace.checkout("develop")
+            @scm_workspace.move(tag)
           end
-          subject{ scm_workspace }
+          subject{ @scm_workspace }
           its(:current_branch_name){ should == "develop" }
           its(:current_tag_names){ should =~ [tag] }
         end
       end
       context "reset to fix wrong reset" do
         before(:all) do
-          FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-          scm_workspace.configure(url)
-          scm_workspace.checkout("develop")
-          scm_workspace.move("v0.1.0")
+          @scm_workspace.clear
+          @scm_workspace.configure(@url)
+          @scm_workspace.checkout("develop")
+          @scm_workspace.move("v0.1.0")
         end
-        subject{ scm_workspace }
+        subject{ @scm_workspace }
         it do
           subject.current_branch_name.should == "develop"
           subject.current_tag_names.should =~ ["v0.1.0"]
@@ -146,35 +145,37 @@ describe ScmWorkspace do
 
     describe :clear do
       before(:all) do
-        FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-        scm_workspace.configure(url)
+        @scm_workspace.clear
+        @scm_workspace.configure(@url)
       end
 
       it do
-        scm_workspace.cleared?.should == false
-        scm_workspace.clear
-        scm_workspace.cleared?.should == true
-        Dir.exist?(scm_workspace.repo_dir).should == false
+        @scm_workspace.cleared?.should == false
+        @scm_workspace.clear
+        @scm_workspace.cleared?.should == true
+        Dir.exist?(@scm_workspace.repo_dir).should == true
+        Dir.exist?(File.join(@scm_workspace.repo_dir, ".git")).should == false
       end
     end
 
   end
 
   context "svn", svn: true do
-    let(:base_url){ "http://rubeus.googlecode.com/svn" }
-    let(:cloning_url){ "#{base_url} -T trunk --branches branches --tags tags" }
+    before(:all) do
+      @base_url = "http://rubeus.googlecode.com/svn"
+      @cloning_url = "#{@base_url} -T trunk --branches branches --tags tags"
+    end
 
     context "after configuring" do
       before(:all) do
-        FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-        scm_workspace.configure(cloning_url)
+        @scm_workspace.clear
+        @scm_workspace.configure(@cloning_url)
       end
-      subject{ scm_workspace }
+      subject{ @scm_workspace }
 
       its(:configured?){ should == true}
       its(:cleared?){ should == false }
-      its(:url){ should == base_url }
-      its(:options){ should == {"url" => base_url, "trunk" => "trunk", "branches" => "branches", "tags" => "tags"} }
+      its(:url){ should == @base_url }
 
       its(:scm_type){ should == :svn}
       its(:git_repo?){ should == false }
@@ -190,20 +191,20 @@ describe ScmWorkspace do
       its(:current_commit_key){ should =~ /\A[0-9a-f]{40}:247\Z/ }
 
       it :fetch do
-        scm_workspace.fetch
+        @scm_workspace.fetch
       end
     end
 
     context "duplicated configuration" do
       before(:all) do
-        FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-        scm_workspace.configure(cloning_url)
+        @scm_workspace.clear
+        @scm_workspace.configure(@cloning_url)
       end
-      subject{ scm_workspace }
+      subject{ @scm_workspace }
 
       it do
         expect{
-          scm_workspace.configure(cloning_url)
+          @scm_workspace.configure(@cloning_url)
         }.to raise_error(/not empty/i)
       end
     end
@@ -213,11 +214,11 @@ describe ScmWorkspace do
 
         context branch_name do
           before(:all) do
-            FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-            scm_workspace.configure(cloning_url)
-            scm_workspace.checkout(branch_name)
+            @scm_workspace.clear
+            @scm_workspace.configure(@cloning_url)
+            @scm_workspace.checkout(branch_name)
           end
-          subject{ scm_workspace }
+          subject{ @scm_workspace }
           its(:current_branch_name){ should == branch_name }
           its(:current_tag_names){ should == [] }
         end
@@ -226,21 +227,21 @@ describe ScmWorkspace do
 
       context "branch is updated" do
         before(:all) do
-          FileUtils.remove_entry_secure(scm_workspace.repo_dir) if Dir.exist?(scm_workspace.repo_dir)
-          scm_workspace.configure(cloning_url)
-          scm_workspace.checkout("trunk")
-          Dir.chdir(scm_workspace.repo_dir) do
+          @scm_workspace.clear
+          @scm_workspace.configure(@cloning_url)
+          @scm_workspace.checkout("trunk")
+          Dir.chdir(@scm_workspace.repo_dir) do
             # バージョンを巻き戻す
             system("git reset --hard HEAD~3")
           end
         end
 
         it "checkout again" do
-          scm_workspace.current_commit_key.should =~ /\A[0-9a-f]{40}:244\Z/
-          scm_workspace.status.should =~ /3 commits.*current revision: 244.*latest revision: 247/
-          scm_workspace.checkout("trunk")
-          scm_workspace.current_commit_key.should =~ /\A[0-9a-f]{40}:247\Z/
-          scm_workspace.status.should =~ /up-to-dated/
+          @scm_workspace.current_commit_key.should =~ /\A[0-9a-f]{40}:244\Z/
+          @scm_workspace.status.should =~ /3 commits.*current revision: 244.*latest revision: 247/
+          @scm_workspace.checkout("trunk")
+          @scm_workspace.current_commit_key.should =~ /\A[0-9a-f]{40}:247\Z/
+          @scm_workspace.status.should =~ /up-to-dated/
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scm_workspace
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement