dev 1.0.203 → 1.0.204

data/lib/dev/Commands.rb

@@ -138,14 +138,15 @@ class Commands < Hash
   def has_diff
     call=nil
   
-    if DEV[:scm_type] == "git" #File.exists?(".git")
+    if DEV[:scm_type] == "git" 
       call=Dev::SystemCall.new('git status')
       return true if call.output.include?("new file:")
       return true if call.output.include?("deleted:")
       return true if call.output.include?("modified:")
+	  return false
     end
     
-    call=Dev::SystemCall.new('git diff --name-only') if File.exists?(".git")
+    #call=Dev::SystemCall.new('git diff --name-only') if File.exists?(".git")
     call=Dev::SystemCall.new('svn diff') if File.exists?(".svn")
 
     unless call.nil? || call.output.length==0

data/lib/dev/Scm.rb

@@ -13,15 +13,29 @@ class Scm
   end
   
   def file_tracked?(file)
+    puts_debug "file_tracked?(" + file + ")"
+	puts_debug "scm_type = #{@scm_type}"
     if @scm_type=="git"
-      call=Dev::SystemCall.new("git ls-files #{file} -error_unmatch")
-      return true if call.status==0
+      call=Dev::SystemCall.new("git ls-files #{file} --error-unmatch")
+	  puts_debug "call.output:"
+	  puts_debug call.output
+	  puts_debug "call.error"
+	  puts_debug call.error
+	  if call.status==0
+	    puts_debug "file IS tracked by git."
+	    puts_debug call.output
+	    return true
+	  else
+	    puts_debug "file is NOT tracked by git."
+	    #return false
+	  end
+      #return true if call.status==0
     end
-    false
+    #false
   end
   
   def add_file(file)
-    call=Dev::SystemCall.new("git add #{file}") if @scm_type=="git"
+    #call=Dev::SystemCall.new("git add #{file}") if @scm_type=="git"
     
     if @scm_type=="svn"
 	  afile=file
@@ -38,9 +52,12 @@ class Scm
 	if @scm_type=="git"
 	  afile=file
 
-	  `git status "#{afile}"`
-	  status=$?.exitstatus 
-	  if(status != 0)
+	  #`git status "#{afile}"`
+	  #status=$?.exitstatus 
+	  #if(status != 0)
+	  if(file_tracked?(afile))
+	    puts "file #{afile} is tracked by git"
+	  else
         call=Dev::SystemCall.new("git add \"#{afile}\"")
         call.puts_summary
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.203
+  version: 1.0.204
   prerelease: 
 platform: ruby
 authors: