git-gsub 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c483c9e6777124fe091ed2c0690820f7652c8a93c66a3d3b9253cada57d2fc
-  data.tar.gz: 38d7d216fd4e7a3bb3f1bef1485352037e4e2e60a87e3c97eda8db2952f82844
+  metadata.gz: d2d4f13c299246f00bae6051f341cbe768dd1e6bff6e605de3cd9e30e51f74a5
+  data.tar.gz: a0ff902ec617456bbffb774b918abdef9d87b32d967351611712a03092a0f277
 SHA512:
-  metadata.gz: 7749435b2ddba65ebdfdf984cc1641d9246fb49b41ca1c109cf2a95637edab639c7196c6a880aa7068c9223110f05949218ceb79990aef7574c58326511d851d
-  data.tar.gz: bc9a9eedf7bb86779ddf1f0b6a725a174a7decee735bd0879d556199f3888bec4ae29712a95f5c7754374a9b3f213782f0c2b8abd7d2ef5d703539b99ea82c3e
+  metadata.gz: 712074c23807b21810df46e94badaa78fd08b9bbe3bb38242505914ab63666efe0c645ad26a01349b0a6a364865e29d3aa2010c0f42fd19bdaeff0765ce93ad1
+  data.tar.gz: 696f74b7234ae7fe2498e489fa1e57bd57fe9104166a917d4e0267fa2027a026b3f98acc2c7ddf5b8f8f5c647b38e39043ee5817fc26e239556b1b99d8513ffe

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.0.9]
+### Fixed
+- Make `--dry-run` works with `--rename`([#10](https://github.com/fujimura/git-gsub/pull/10))
+
+## [0.0.8]
+### Fixed
+- Fix bug on passing file names to `Open3.capture3`[c05a05c](https://github.com/fujimura/git-gsub/commit/c05a05cd413d5a389c781b6649b42a46a825c4db)
+
+## [0.0.7]
+### Fixed
+- Fix escaping @([#8](https://github.com/fujimura/git-gsub/pull/8)) Thanks @amatsuda!
+
 ## [0.0.6]
 ### Added
 - Add option to substitute in camel/kebab/snake case

data/README.md

@@ -16,6 +16,8 @@ Usage: git gsub [options] FROM TO [PATHS]
 
 ## Example
 
+### Normal substutution
+
 To substitute `Git` with `Subversion`:
 
 ```
@@ -47,7 +49,8 @@ index c30f093..03b7c4c 100755
 +Subversion::Gsub.run
 ```
 
-## Experimental features
+### Case-converting substitution
+
 To substitute `CommonLisp` with `VisualBasic` with case-awareness:
 
 ```
@@ -66,6 +69,8 @@ index 2185dbf..393dbc6 100644
 +# VisualBasic visual_basic visual-basic
 ```
 
+### Substitute and rename file
+
 Substitute and rename file:
 
 ```

data/lib/git/gsub.rb

@@ -79,7 +79,7 @@ module Git
 
         def run_commands(commands)
           if options[:dry]
-            commands.each { |args| puts args.join(' ') }
+            commands.each { |args| puts Array(args).join(' ') }
           else
             commands.each { |args| Open3.capture3(*args) }
           end

data/lib/git/gsub/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Gsub
-    VERSION = '0.0.8'.freeze
+    VERSION = '0.0.9'.freeze
   end
 end

data/spec/git_gsub_spec.rb

@@ -9,12 +9,9 @@ RSpec.configure do |config|
 end
 
 describe 'git-gsub' do
-  def run_in_directory_with_a_file(filename, content)
+  def run_in_tmp_repo
     Dir.mktmpdir do |dir|
       Dir.chdir dir do
-        dirname = File.dirname(filename)
-        FileUtils.mkdir_p(dirname) unless File.exists?(dirname)
-        File.open(filename, 'w') { |f| f << content }
         `git init`
         `git config --local user.email "you@example.com"`
         `git config --local user.name "Your Name"`
@@ -25,81 +22,111 @@ describe 'git-gsub' do
     end
   end
 
-  it 'should substitute files' do
-    run_in_directory_with_a_file 'README.md', 'Git Subversion Bzr' do
-      Git::Gsub.run %w[Bzr Mercurial]
-      expect(File.read('README.md')).to eq 'Git Subversion Mercurial'
+  def commit_file(name, content)
+    FileUtils.mkdir_p(File.dirname(name))
+    File.write(name, content)
+    `git add .`
+    `git commit -m 'Add #{name}'`
+  end
+
+  around do |example|
+    run_in_tmp_repo do
+      example.run
     end
   end
 
+  it 'should substitute files' do
+    commit_file 'README.md', 'Git Subversion Bzr'
+    Git::Gsub.run %w[Bzr Mercurial]
+
+    expect(File.read('README.md')).to eq 'Git Subversion Mercurial'
+  end
+
   it 'should substitute files with case conversion' do
-    run_in_directory_with_a_file 'README.md', 'GitGsub git_gsub git-gsub' do
-      Git::Gsub.run %w[GitGsub SvnGsub --camel --kebab --snake]
-      expect(File.read('README.md')).to eq 'SvnGsub svn_gsub svn-gsub'
-    end
+    commit_file 'README.md', 'GitGsub git_gsub git-gsub'
+    Git::Gsub.run %w[GitGsub SvnGsub --camel --kebab --snake]
+
+    expect(File.read('README.md')).to eq 'SvnGsub svn_gsub svn-gsub'
   end
 
   it 'should escape well' do
-    run_in_directory_with_a_file 'README.md', %(<h1 class="foo">) do
-      Git::Gsub.run [%(<h1 class="foo">), %(<h1 class="bar">)]
-      expect(File.read('README.md')).to eq %(<h1 class="bar">)
-    end
+    commit_file 'README.md', %(<h1 class="foo">)
+    Git::Gsub.run [%(<h1 class="foo">), %(<h1 class="bar">)]
+
+    expect(File.read('README.md')).to eq %(<h1 class="bar">)
   end
 
-  it do
-    run_in_directory_with_a_file 'README.md', %(Hello this is @git) do
-      Git::Gsub.run [%(@git), %(@@svn)]
-      expect(File.read('README.md')).to eq %(Hello this is @@svn)
-    end
+  it 'should substutute @' do
+    commit_file 'README.md', %(foo@example.com)
+    Git::Gsub.run [%(@example), %(bar@example)]
+
+    expect(File.read('README.md')).to eq %(foobar@example.com)
   end
 
-  it do
-    run_in_directory_with_a_file 'README.md', %(Hello this is "git") do
-      Git::Gsub.run [%("git"), %('svn')]
-      expect(File.read('README.md')).to eq %(Hello this is 'svn')
-    end
+  it 'should substitute consequenting @' do
+    commit_file 'README.md', %(Hello this is @git)
+    Git::Gsub.run [%(@git), %(@@svn)]
+
+    expect(File.read('README.md')).to eq %(Hello this is @@svn)
   end
 
-  it do
-    run_in_directory_with_a_file 'README.md', %({git{svn}) do
-      Git::Gsub.run [%({git{svn}), %({hg{svn})]
-      expect(File.read('README.md')).to eq %({hg{svn})
-    end
+  it %(should substitute " to ') do
+    commit_file 'README.md', %(Hello this is "git")
+    Git::Gsub.run [%("git"), %('svn')]
+
+    expect(File.read('README.md')).to eq %(Hello this is 'svn')
   end
 
-  it do
-    run_in_directory_with_a_file 'README.md', %(foo@example.com) do
-      Git::Gsub.run [%(@example), %(bar@example)]
-      expect(File.read('README.md')).to eq %(foobar@example.com)
-    end
+  it %(should substitute ' to ") do
+    commit_file 'README.md', %(Hello this is 'git')
+    Git::Gsub.run [%('git'), %("svn")]
+
+    expect(File.read('README.md')).to eq %(Hello this is "svn")
+  end
+
+  it 'should substitute text including { and }'do
+    commit_file 'README.md', %({git{svn})
+    Git::Gsub.run [%({git{svn}), %({hg{svn})]
+
+    expect(File.read('README.md')).to eq %({hg{svn})
   end
 
   it 'should not create backup file' do
-    run_in_directory_with_a_file 'README.md', 'Git Subversion Bzr' do
-      Git::Gsub.run %w[Bzr Darcs]
-      expect(`ls`).to eql "README.md\n"
-    end
+    commit_file 'README.md', 'Git Subversion Bzr'
+    Git::Gsub.run %w[Bzr Darcs]
+
+    expect(`ls`).to eql "README.md\n"
   end
 
   it 'should rename with --rename' do
-    run_in_directory_with_a_file 'README-git_gsub.md', 'GitGsub git_gsub git-gsub' do
-      Git::Gsub.run %w[GitGsub SvnGsub --snake --rename]
-      expect(`ls`).to eql "README-svn_gsub.md\n"
-      expect(File.read('README-svn_gsub.md')).to eq 'SvnGsub svn_gsub git-gsub'
-    end
+    commit_file 'README-git_gsub.md', 'GitGsub git_gsub git-gsub'
+    Git::Gsub.run %w[GitGsub SvnGsub --snake --rename]
 
-    run_in_directory_with_a_file 'lib/git.rb', 'puts "Git"' do
-      Git::Gsub.run %w[git svn --camel --rename]
-      expect(`ls lib`).to eql "svn.rb\n"
-      expect(File.read('lib/svn.rb')).to eq 'puts "Svn"'
-    end
+    expect(`ls`).to eql "README-svn_gsub.md\n"
+    expect(File.read('README-svn_gsub.md')).to eq 'SvnGsub svn_gsub git-gsub'
+  end
+
+  it 'should rename with --rename' do
+    commit_file 'lib/git.rb', 'puts "Git"'
+    Git::Gsub.run %w[git svn --camel --rename]
+
+    expect(`ls lib`).to eql "svn.rb\n"
+    expect(File.read('lib/svn.rb')).to eq 'puts "Svn"'
   end
 
   it 'should do nothing if no file found' do
-    run_in_directory_with_a_file 'README-git_gsub.md', 'GitGsub git_gsub git-gsub' do
-      expect {
-        Git::Gsub.run %w[Atlanta Chicago --snake --rename]
-      }.not_to raise_error
-    end
+    commit_file 'README-git_gsub.md', 'GitGsub git_gsub git-gsub'
+
+    expect {
+      Git::Gsub.run %w[Atlanta Chicago --snake --rename]
+    }.not_to raise_error
+  end
+
+  it 'should output command with dry-run' do
+    commit_file 'README-git_gsub.md', 'GitGsub git_gsub git-gsub'
+
+    expect {
+      Git::Gsub.run %w[GitGsub SvnGsub --snake --rename --dry-run]
+    }.to output(/Svn/).to_stdout
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-gsub
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Fujimura Daisuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport