dev 1.0.233 → 1.0.235

data/lib/dev/Environment.rb

@@ -22,8 +22,6 @@ class Environment
 	  return ENV[v].gsub('\\','/') unless ENV[v].nil?
 	 }
      dir="~"
-     #dir=ENV["HOME"] unless ENV["HOME"].nil?
-     #dir=ENV["USERPROFILE"].gsub('\\','/') unless ENV["USERPROFILE"].nil?
    end
 
    def self.dev_root

data/lib/dev/Project.rb

@@ -65,6 +65,35 @@ class Project < Hash
 	#db = Dev::Database.new
 	#db.set_branch_uri(self[:fullname],self[:scm_uri])
 	puts_debug "DEV refresh elapsed time " + (Time.now-start_time).to_s
+
+	begin
+	  updateProductsDB
+	rescue
+	end
+  end
+
+  def updateProductsDB
+    filename = Dev::Environment.user_profile + "/Development.sql"
+	if(File.exists?(filename) && !DEV[:scm_uri].nil? && DEV[:scm_uri].length > 0)
+	  db = SQLite3::Database.new filename
+	  insert = true
+	  id=nil
+	  db.execute("select * from Products where name='" + DEV[:fullname] + "';") do |row|
+	    id=row[0]
+		name=row[1].to_s
+		uri=row[2].to_s
+		insert = false if(name==DEV[:fullname] && uri==DEV[:scm_uri])
+	  end
+	  if(insert)
+	    sid="null"
+		sid=id.to_s if !id.nil?
+	    sql="insert or replace into Products VALUES(" + sid + ",'" + DEV[:fullname].to_s + "','" + DEV[:scm_uri].to_s + "');"
+		puts_debug "sql=#{sql}"
+	    db.execute(sql)
+		db.close
+		db=nil 
+	  end
+	end
   end
 
   def get_default_value_name

data/lib/dev/Scm.rb

@@ -107,7 +107,7 @@ class Scm
     text=`svn info`
 	if(!text.include?("not a working copy"))
 	  text.scan(/URL: ([\w:\/.-]+)/).each { |m|
-	    return m
+	    return m[0]
 	  }
 	end
 	return nil

data/lib/dev/SystemCall.rb

@@ -220,11 +220,21 @@ class SystemCall
      dir="~"
   end
 
+  def split(input)
+    m = /(?:'(?:\\.|[^'])*'|[^' ])+/.match(input)
+  end
+
   def log
     filename = user_profile + "/CommandHistory.sql"
 	sql=""
 	if(File.exists?(filename))
 	  begin
+	    words = split(@command)
+		cmd = words[0]
+		arguments = @command.gsub("#{cmd} ","");
+		executable = cmd
+		cmd = File.basename(executable).gsub(File.extname(executable),"");
+
 	    db = SQLite3::Database.new filename
 		@timeout=0 if @timeout.nil?
 		@dir=Rake.original_dir() if(@dir.nil?)
@@ -232,17 +242,19 @@ class SystemCall
                          "','" + @end_time.strftime('%Y-%m-%dT%H:%M:%S') +
                          "','" + Time.at(elapsed).gmtime.strftime('%H:%M:%S') +
                           "'," + @status.to_s +
-                          ",'" + @command.gsub("'","''") +
+                          ",'" + cmd +                          #@command.gsub("'","''") +
+						 "','" + arguments +
                          "','" + @dir.to_s +
                          "','" + @output.gsub("'", "''") +
                          "','" + @error.gsub("'", "''") +
+						 "','" + executable +
                           "'," + @timeout.to_s + ")"
 	    sql="insert into Commands #{values};"
         db.execute(sql)
 	    db.close
 	    db=nil
 	  rescue
-	    puts "failed to execute '#{sql}'"
+	    #puts_debug "failed to execute '#{sql}'"
 	  end
 	end
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.233
+  version: 1.0.235
+  prerelease: 
 platform: ruby
 authors:
 - Lou Parslow
@@ -13,169 +14,193 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: semver
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: development tasks
@@ -216,26 +241,27 @@ files:
 - bin/devgem
 homepage: http://rubygems.org/gems/dev
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: dev
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: dev
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a015dbb0623d97526d1c798a552b78803a125548
-  data.tar.gz: 3ef1c8af9f49c5018d88e130129a2d07805ef702
-SHA512:
-  metadata.gz: f37a6a83b5ab407c4a68e39c05de70aeb914e4657f7e93c15c52b8a77e88069fe69e4b23965682149e416e33411fde3a4f20a902466079ca54220191b8ed70b8
-  data.tar.gz: b313d76b77d9123d8c3377728a6d74662f684e1e9a13da3111bb6d3fd7445de89b98f60126450417b23d95c82cb306052b7a221dd0c6209bb10efd3f94384bba