dev 1.0.17 → 1.0.18

data/lib/dev/Project.rb

@@ -176,8 +176,9 @@ class Project < Hash
   
   def pull
     array_method("pull")
-    puts "  updating revision variables"
-    Dev::Svn::update_revision_variables("rakefile.rb")
+    filename=Dir.pwd + "/rakefile.rb"
+    puts "  updating revision variables for " + filename
+    Dev::Svn::update_revision_variables(filename)
   end
   
   def info

data/lib/dev/Svn.rb

@@ -16,11 +16,12 @@ class Svn
     if File.exist?(filename)
       revision=Dev::Svn::last_changed_revision(url)
       replace="#{variable_name}='#{revision}'"
+      puts "  " + replace + " in " + filename unless revision=="0"
       text=File.read(filename)
       unless text.include?(replace)
         unless revision == "0"
           puts "  updating " + filename + " with " + replace
-          search=Regexp.new("#{variable_name}='[\\d]+'")
+          search=Regexp.new("#{variable_name}=['\"][\\d]+['\"]")
           Dev::Environment.replace_text_in_file(filename,search,"#{variable_name}='#{revision}'")
         end
       end
@@ -29,21 +30,24 @@ class Svn
   
   def self.update_revision_variables(filename)
     if File.exist?(filename)
+      puts_debug "scanning " + filename + " for revision variables"
       text=File.read(filename)
       # extract potential variable names of form 
-      text.scan(/([A-Z_]+)='[\d]+'/).each{ | var_match |
-        #puts "found var_match: " + var_match[0].to_s
+      text.scan(/([\dA-Z_]+)=['"][\d]+['"]/).each{ | var_match |
+        puts_debug "found var_match: " + var_match[0].to_s
         varname = var_match[0].to_s
         # extract potential urls that use the variable name
         # '([.\w:\/-]+)@#{INTERFACE_REV}'
-        uri_search=Regexp.new("'([.\\w:\\/-]+)@" + '#{' + "#{varname}" + '}' + "'")
+        uri_search=Regexp.new("['\"]([.\\w:\\/-]+)@" + '#{' + "#{varname}" + '}' + "['\"]")
         #puts uri_search.to_s
         text.scan(uri_search).each { |uri_match|
-          #puts "found uri_match: " + uri_match.to_s
+          puts_debug "found uri_match: " + uri_match.to_s
           uri=uri_match[0].to_s
           update_revision_variable(filename,varname,uri)
         }
       }
+    else
+      puts "  " + filename + " does not exist"
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &3143628 !ruby/object:Gem::Requirement
+  requirement: &23903004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3143628
+  version_requirements: *23903004
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &3142968 !ruby/object:Gem::Requirement
+  requirement: &23901096 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3142968
+  version_requirements: *23901096
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &3142476 !ruby/object:Gem::Requirement
+  requirement: &23899896 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3142476
+  version_requirements: *23899896
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &3141780 !ruby/object:Gem::Requirement
+  requirement: &23897796 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3141780
+  version_requirements: *23897796
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &3140208 !ruby/object:Gem::Requirement
+  requirement: &23919888 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3140208
+  version_requirements: *23919888
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &3139200 !ruby/object:Gem::Requirement
+  requirement: &23918784 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3139200
+  version_requirements: *23918784
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &3138528 !ruby/object:Gem::Requirement
+  requirement: &23917752 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3138528
+  version_requirements: *23917752
 description: development tasks
 email: lou.parslow@gmail.com
 executables: