git-gsub 0.0.6 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83807335e80f98fadabfb3952e2791973f3402fc
-  data.tar.gz: 8cb9229c0bfdc60b580fafc80269424f33fe041c
+SHA256:
+  metadata.gz: cdbaa36daf4b1b651664f8e2c6249c926b7da18813a523e5acef6ba9110298ea
+  data.tar.gz: ab255f1a554458c5f4725714015630b154fc9483a278fc246ffce967b4175837
 SHA512:
-  metadata.gz: 6e26c83eb04af98873ef2b479f408eea7b29ee997ac38a835cb58f918a3c1a3f4924f8238b2f9d03de000e71247104276265c400ab7a41b8a8de589e165f83a0
-  data.tar.gz: 806e3d07a225082419864df8fd74a1dc3d0b0aa37c47f6363c93a27298e874b826efe16fe39a2acffba8ec49e95f362306dd0eaec98e853261c779710a9e3a0f
+  metadata.gz: 3808ba02a0ed1ad307f657e566fb1bb2b2bb94653097f091280af21dae04bd795a1da01062285cd66ea1435272bb8d2aa091c838db2a14f74fc46d8c0ddc1d67
+  data.tar.gz: 32254b23f90248771eb31fca3c440c532fd2fce80668baba104e06ad0a4c85fb53e49fb52a04fb57d77bb0d2443fb86e58ff1d42eed13af5d7e00700fe2cc803

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.0.11]
+### Changed
+- Support newer and safer activesupport ([#13](https://github.com/fujimura/git-gsub/pull/13))
+- Add deprecation message on installation ([#13](https://github.com/fujimura/git-gsub/pull/13))
+
+## [0.0.10]
+### Changed
+- Support activesupport >= 4 & < 6 ([#12](https://github.com/fujimura/git-gsub/pull/12)) Thanks @hanachin!
+
+## [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/git-gsub.gemspec

@@ -3,23 +3,26 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'git/gsub/version'
 
+GIT_GSUB_RUBY_IS_DEPRECATED = %q{git-gsub: Newer version is written in Go and Ruby implementation is deprecated. See https://github.com/fujimura/git-gsub}
+
 Gem::Specification.new do |spec|
   spec.name          = "git-gsub"
   spec.version       = Git::Gsub::VERSION
   spec.authors       = ["Fujimura Daisuke"]
   spec.email         = ["me@fujimuradaisuke.com"]
-  spec.summary       = %q{A Git subcommand to do gsub in a repository}
-  spec.description   = %q{A Git subcommand to do gsub in a repository}
+  spec.summary       = GIT_GSUB_RUBY_IS_DEPRECATED
+  spec.description   = GIT_GSUB_RUBY_IS_DEPRECATED
   spec.homepage      = "https://github.com/fujimura/git-gsub"
   spec.license       = "MIT"
+  spec.post_install_message = GIT_GSUB_RUBY_IS_DEPRECATED
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.add_dependency "activesupport", "~> 4"
+  spec.add_dependency "activesupport", ">= 6.0.3.1"
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"

data/lib/git/gsub.rb

@@ -3,6 +3,7 @@ require 'active_support/inflector'
 require 'optparse'
 require 'shellwords'
 require 'English'
+require "open3"
 
 module Git
   module Gsub
@@ -78,9 +79,9 @@ module Git
 
         def run_commands(commands)
           if options[:dry]
-            commands.each { |c| puts c }
+            commands.each { |args| puts Array(args).join(' ') }
           else
-            commands.each { |c| system c }
+            commands.each { |args| Open3.capture3(*args) }
           end
         end
 
@@ -103,11 +104,13 @@ module Git
 
         def build_command(from, to, paths = [], _options = {})
           from, to, *paths = [from, to, *paths].map { |s| Shellwords.escape s }
+          [from, to].each { |s| s.gsub! '@', '\@' }
 
-          target_files = `git grep -l #{from} #{paths.join ' '}`.each_line.map(&:chomp).join ' '
+          target_files = `git grep -l #{from} #{paths.join ' '}`.each_line.map(&:chomp)
           return if target_files.empty?
 
-          %(perl -pi -e 's{#{from}}{#{to}}g' #{target_files})
+
+          ['perl', '-pi', '-e', "s{#{from}}{#{to}}g", *target_files]
         end
       end
 

data/lib/git/gsub/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Gsub
-    VERSION = '0.0.6'.freeze
+    VERSION = '0.0.11'.freeze
   end
 end

data/spec/git_gsub_spec.rb

@@ -3,13 +3,15 @@ require 'tmpdir'
 require 'git/gsub'
 require 'pry'
 
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+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"`
@@ -20,63 +22,123 @@ 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
+
+  let!(:git_gsub_path) {
+    if ENV['USE_RUBY']
+      File.expand_path("../../bin/git-gsub-ruby", __FILE__)
+    else
+      File.expand_path("../../bin/git-gsub", __FILE__)
+    end
+  }
+
+  around do |example|
+    run_in_tmp_repo do
+      example.run
     end
   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]
+  describe 'Substituting' do
+    it 'should substitute files' do
+      commit_file 'README.md', 'Git Subversion Bzr'
+      `#{git_gsub_path} Bzr Mercurial`
+
+      expect(File.read('README.md')).to eq 'Git Subversion Mercurial'
+    end
+
+    it 'should substitute files with case conversion' do
+      commit_file 'README.md', 'GitGsub git_gsub git-gsub'
+      `#{git_gsub_path} GitGsub SvnGsub --camel --kebab --snake`
+
       expect(File.read('README.md')).to eq 'SvnGsub svn_gsub svn-gsub'
     end
-  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">)]
+    it 'should escape well' do
+      commit_file 'README.md', %(<h1 class="foo">)
+      `#{git_gsub_path} '<h1 class="foo">' '<h1 class="bar">'`
+
       expect(File.read('README.md')).to eq %(<h1 class="bar">)
     end
 
-    run_in_directory_with_a_file 'README.md', %(git/gsub) do
-      Git::Gsub.run [%(git/gsub), %(svn/sub)]
-      expect(File.read('README.md')).to eq %(svn/sub)
+    it 'should substutute @' do
+      commit_file 'README.md', %(foo@example.com)
+      `#{git_gsub_path} @example bar@example`
+
+      expect(File.read('README.md')).to eq %(foobar@example.com)
     end
 
-    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})
+    it 'should substitute consequenting @' do
+      commit_file 'README.md', %(Hello this is @git)
+      `#{git_gsub_path} @git @@svn`
+
+      expect(File.read('README.md')).to eq %(Hello this is @@svn)
     end
-  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]
+    it %(should substitute " to ') do
+      commit_file 'README.md', %(Hello this is "git")
+      `#{git_gsub_path} '"git"' "'svn'"`
+
+      expect(File.read('README.md')).to eq %(Hello this is 'svn')
+    end
+
+    it %(should substitute ' to ") do
+      commit_file 'README.md', %(Hello this is 'git')
+      `#{git_gsub_path} "'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_path} {git{svn} {hg{svn}}`
+
+      expect(File.read('README.md')).to eq %({hg{svn}})
+    end
+
+    it 'should not create backup file' do
+      commit_file 'README.md', 'Git Subversion Bzr'
+      `#{git_gsub_path} Bzr Darcs`
+
       expect(`ls`).to eql "README.md\n"
     end
   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]
+  describe 'Renaming' do
+    it 'should rename with --rename' do
+      commit_file 'README-git_gsub.md', 'GitGsub git_gsub git-gsub'
+      `#{git_gsub_path} 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
 
-    run_in_directory_with_a_file 'lib/git.rb', 'puts "Git"' do
-      Git::Gsub.run %w[git svn --camel --rename]
+    it 'should rename with --rename' do
+      commit_file 'lib/git.rb', 'puts "Git"'
+      `#{git_gsub_path} git svn --camel --rename`
+
       expect(`ls lib`).to eql "svn.rb\n"
       expect(File.read('lib/svn.rb')).to eq 'puts "Svn"'
     end
-  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
+    it 'should do nothing if no file found' do
+      commit_file 'README-git_gsub.md', 'GitGsub git_gsub git-gsub'
+
       expect {
-        Git::Gsub.run %w[Atlanta Chicago --snake --rename]
+        `#{git_gsub_path} Atlanta Chicago --snake --rename`
       }.not_to raise_error
     end
   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,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: git-gsub
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.11
 platform: ruby
 authors:
 - Fujimura Daisuke
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 6.0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 6.0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Git subcommand to do gsub in a repository
+description: 'git-gsub: Newer version is written in Go and Ruby implementation is
+  deprecated. See https://github.com/fujimura/git-gsub'
 email:
 - me@fujimuradaisuke.com
 executables:
@@ -104,7 +105,8 @@ homepage: https://github.com/fujimura/git-gsub
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: 'git-gsub: Newer version is written in Go and Ruby implementation
+  is deprecated. See https://github.com/fujimura/git-gsub'
 rdoc_options: []
 require_paths:
 - lib
@@ -119,10 +121,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
-summary: A Git subcommand to do gsub in a repository
+summary: 'git-gsub: Newer version is written in Go and Ruby implementation is deprecated.
+  See https://github.com/fujimura/git-gsub'
 test_files:
 - spec/git_gsub_spec.rb