namer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663e385d757df24b6440c7d7e92ddd6b2202e11e
-  data.tar.gz: 2ed6e778eb932f43ba439c7a7cd9867f7a4943c7
+  metadata.gz: 7431a136f0186b985ed5385a62e94963c7fbe4a1
+  data.tar.gz: fac65f4bf4ac9a9e7bb0c9a0d8bc6264050b2feb
 SHA512:
-  metadata.gz: 1967de4a7095b418c48ff541aeec312a753b1eb7368e8e82301a493b6eee83859d85b046c84bb6f5a7c5f7436d741bd42211219e97ab55c02dd5c85ef0fd44b1
-  data.tar.gz: 8298a1c94447cd3c53e3695fbeac6e714c9d91f400e9304ff9bcb6dbb5847ea694af792f728bd90a389887fcaf7f5a4100408609df6a84cd21a117c4ba2cd29f
+  metadata.gz: 46582a68c19fd1dd3829f96b572e71616d952c78d770d8f8fbb50ea0b8d1516ebfe7f399af8553010b5f47f788f1bba08c683c59fe8f5ab88a731e435c9c16fd
+  data.tar.gz: 3855136a11c65f0bbe6dfd297883bf8ed360a0cf9467f5c6a62198e490af98d8a42a59a43d1c92985f41dcac06b86bc68cbf513607843f88e3725d41f9cf17d6

data/lib/namer.rb

@@ -7,9 +7,9 @@ class Namer
     args.each do |arg|
       next unless arg.include?(':')
       @from, @to  = arg.split(':')
-      rename        unless args.include?('--no-rename')
-      replace       unless args.include?('--no-replace')
-      rename_remote unless args.include?('--no-remote')
+      rename         unless args.include?('--no-rename')
+      replace        unless args.include?('--no-replace')
+      rename_remote  unless args.include?('--no-remote')
     end
   end
 
@@ -27,6 +27,11 @@ class Namer
     str.gsub(from_regex, "\\1#{@to}\\2")
   end
 
+  def inline_gsub(str)
+    return str unless split_str = str.split(/# -- replace\n/)[1]
+    split_str.gsub(/^\s*# /, '')
+  end
+
   def rename_remote
     url = remote
     new_url = gsub(url)
@@ -54,8 +59,13 @@ class Namer
     dir("**/*").each do |path|
       next unless File.file?(path)
       text = File.read(path)
-      next unless (text =~ from_regex rescue nil)
-      File.open(path, 'w') { |f| f.write(gsub(text)) }
+      begin
+        text = gsub(text)
+        text = inline_gsub(text)
+      rescue Exception => e
+      ensure
+        File.open(path, 'w') { |f| f.write(text) }
+      end
     end
   end
 end

data/namer.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "namer"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Winton Welsh"]
   spec.email         = ["mail@wintoni.us"]
   spec.description   = %q{Project template manager}

data/spec/namer_spec.rb

@@ -7,6 +7,10 @@ describe Namer do
     FileUtils.rm_rf(fixture)
     FileUtils.mkdir_p("#{fixture}/project")
     
+    File.open("#{fixture}/project.rb", 'w') do |f|
+      f.write("fail\n# -- replace\n# success")
+    end
+
     File.open("#{fixture}/project/project.rb", 'w') do |f|
       f.write("project\nProject\nMyProject")
     end
@@ -19,6 +23,7 @@ describe Namer do
     namer = Namer.new([ "project:new_project", "Project:NewProject" ])
     namer.remote.should == "https://github.com/winton/new_project.git"
 
+    File.read("#{fixture}/new_project.rb").should == "success"
     File.read("#{fixture}/new_project/new_project.rb").should == "new_project\nNewProject\nMyProject"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: namer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler