scm_workspace 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b5aed2ebb23effa0e4d640181d609aa67fbf26
-  data.tar.gz: c49b9fa6ff2dab68bfd7bfcfcb4b77f9481ef497
+  metadata.gz: 629f7fb29d5ef531cceaef646f520543465b360c
+  data.tar.gz: 34de1677365fe70f213b18ab0297afd4ec510849
 SHA512:
-  metadata.gz: 189d7d0d60e6fa0bd1f490ffee50f0047e1a2e853c42eb940e6817798760e42b946b9739dec09cd79abdb6b43ef81081481e095268ac8a2d77ada54608de9ea0
-  data.tar.gz: 0846be292f4e3ab347608db6c70a480d5e0c8ab175bd6727ef3bb005149c1b20ebcf401f88833d5e12088b01a9bdf3918a16201586d2b430d77d17039a166fad
+  metadata.gz: 3d6eefbb6c85f92d72b78d6a339bf47441588271ecdbd122243217c62997d5de277b06609aa66c5cf24327c667f81c732709db116abd6247e342381e274db483
+  data.tar.gz: 0c5ae5a04d84b6d08d06dbf7b7548e9b35169fe3f1dda63ad9143a91fa72b10cea6b033ec6fff9126fb0d4516ce25290a2015b1c4259b2022a37c7526dccdb9c

data/lib/scm_workspace/version.rb

@@ -1,3 +1,3 @@
 class ScmWorkspace
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/scm_workspace.rb

@@ -61,7 +61,7 @@ class ScmWorkspace
   end
 
   def configure(url)
-    if configured?
+    unless empty?
       msg = "#{repo_dir} is not empty. You must clear it"
       msg << "\nls -la #{repo_dir}" << `ls -la #{repo_dir}` if verbose
       raise msg
@@ -87,8 +87,8 @@ class ScmWorkspace
   end
 
   def clear
-    return unless Dir.exist?(repo_dir)
-    fileutils.chdir(repo_dir) do
+    return unless Dir.exist?(root)
+    fileutils.chdir(root) do
       (Dir.glob("*") + Dir.glob(".*")).each do |d|
         next if d =~ /\A\.+\Z/
         fileutils.remove_entry_secure(d)
@@ -96,6 +96,13 @@ class ScmWorkspace
     end
   end
 
+  def empty?
+    return true unless Dir.exist?(root)
+    fileutils.chdir(root) do
+      return (Dir.glob("*") + Dir.glob(".*")).reject{|d| d =~ /\A\.+\Z/}.empty?
+    end
+  end
+
   def checkout(branch_name)
     logger.info("-" * 100)
     system_at_root!("git checkout #{branch_name}")
@@ -147,11 +154,12 @@ class ScmWorkspace
   end
 
   def current_sha
+    return nil unless accessible?
     system_at_root!("git log -1").scan(/^commit ([0-9a-f]+)$/).flatten.first
   end
 
   def current_commit_key
-    return nil unless configured?
+    return nil unless accessible?
     result = current_sha
     case scm_type
     when :svn then
@@ -177,7 +185,7 @@ class ScmWorkspace
   end
 
   def branch_names
-    return nil unless configured?
+    return nil unless accessible?
     case scm_type
     when :git then
       result = system_at_root!("git branch -r").lines.map{|path| path.sub(/\A\s*origin\//, '').strip }
@@ -196,12 +204,12 @@ class ScmWorkspace
   end
 
   def tag_names
-    return nil unless configured?
+    return nil unless accessible?
     system_at_root!("git tag").lines.map{|path| path.strip.strip }
   end
 
   def url
-    return nil unless configured?
+    return nil unless accessible?
     case scm_type
     when :git then remotes["origin"]
     when :svn then svn_info[:repository_root]
@@ -209,7 +217,7 @@ class ScmWorkspace
   end
 
   def current_branch_name
-    return nil unless configured?
+    return nil unless accessible?
     case scm_type
     when :git then git_current_branch_name
     when :svn then svn_current_branch_name
@@ -247,7 +255,7 @@ class ScmWorkspace
   end
 
   def current_tag_names
-    return nil unless configured?
+    return nil unless accessible?
     system_at_root!("git describe --tags #{current_sha}").lines.map(&:strip) rescue []
   end
 
@@ -256,12 +264,24 @@ class ScmWorkspace
     @root
   end
 
+  # submoduleでない場合 true
+  # submoduleの場合     true
+  # gitの対象外の場合   false
+  def accessible?
+    File.exist?(File.join(repo_dir, ".git"))
+  end
+
+  # submoduleでない場合 true
+  # submoduleの場合     false
+  # gitの対象外の場合   false
   def configured?
     Dir.exist?(File.join(repo_dir, ".git"))
   end
 
+
   def cleared?
-    !configured?
+    # !configured?
+    empty?
   end
 
   def contains?(obj)
@@ -292,17 +312,17 @@ class ScmWorkspace
   }
 
   def git_repo?
-    return nil unless configured?
+    return nil unless accessible?
     !remotes.empty? rescue false
   end
 
   def svn_repo?
-    return nil unless configured?
+    return nil unless accessible?
     Dir.exist?(File.join(repo_dir, '.git', 'svn'))
   end
 
   def scm_type
-    return nil unless configured?
+    return nil unless accessible?
     return :git if git_repo?
     return :svn if svn_repo?
     nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scm_workspace
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tengine_support