mmve 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ff3cb10f46ee14137bfb99473ec4898d5c83acfc
+  data.tar.gz: 9bec858348ee596b1597096a0f6d7942bd98b765
+SHA512:
+  metadata.gz: c8e5f51bccb5212f7e19cd204b1abc45ad6ef727bf031c0c5c95baa0127f4dcb341fa8d7dc5030a629285f8ca81558f4063aedc10270d4d7fa0d663be33e7006
+  data.tar.gz: 4aaac79acc5a36714df8c5032979dc51cdd0c2e7a35f2e4afe4281d4bcf516b883854a55db58320ae706ac7663a0ebad7af27c9b4d0697d57f1b869ea9170f68

data/.gitignore

@@ -1,3 +1 @@
-/Gemfile-custom.rb
-/Gemfile.lock
 /tmp/

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,42 @@
+sudo: required
+dist: trusty
+language: c
+addons:
+  apt:
+    packages:
+      - realpath
+notifications:
+  email:
+    - tj+travis_mmve@a13.fr
+  on_success: never
+
+env:
+  - RUBYVER=2.4-stable
+  - RUBYVER=2.3-stable
+  - RUBYVER=2.2-stable
+  - RUBYVER=2.1-stable
+cache:
+  directories:
+    - ${HOME}/.gem/travis
+    - ${HOME}/usr
+  timeout: 3600
+
+before_install:
+  - sudo apt-get --purge remove ruby\*
+  - rm -rf ~/.bash*
+  - unset gem GEM_HOME GEM_PATH RUBYOPT IRBRC
+  - export PATH=/bin:/usr/bin RB=$HOME/usr/bin/ruby
+  - test -x $RB || wget http://ftp.ruby-lang.org/pub/ruby/ruby-${RUBYVER}.tar.xz
+  - test -x $RB || tar xfJ ruby-*.tar.xz
+  - test -x $RB || cd ruby-*
+  - test -x $RB || ./configure --prefix=$HOME/usr --disable-install-doc --with-out-ext=tk
+  - test -x $RB || (make && make install)
+  - echo "source 'https://rubygems.org'; gemspec" > ~/spec_deps.rb
+install:
+  - unset gem GEM_HOME GEM_PATH RUBYOPT IRBRC
+  - export GEM_HOME=~/.gem/travis GEM_PATH=~/.gem/travis
+  - export PATH=$GEM_HOME/bin:$HOME/usr/bin:/bin:/usr/bin
+  - cd $TRAVIS_BUILD_DIR
+  - gem install -g ~/spec_deps.rb
+script:
+  - MMVE_CI=yes RUBYOPT=-I$(realpath lib) rake

data/Guardfile

@@ -1,11 +1,11 @@
-guard :cucumber, cli: '--format pretty --quiet' do
-  watch(%r{\Afeatures/.+\.feature\z})
+guard :cucumber, cmd_additional_args: '--profile guard', all_on_start: false do
+  watch %r{\Afeatures/.+\.feature\z}
   watch(%r{\Afeatures/support/.+\.rb\z})                { 'features' }
   watch(%r{\Afeatures/step_definitions/.+_steps\.rb\z}) { 'features' }
 end
 
-guard :rspec do
-  watch(%r{\Aspec/.+_spec\.rb\z})
+guard :rspec, cmd: 'rspec -f doc' do
+  watch %r{\Aspec/.+_spec\.rb\z}
   watch(%r{\Alib/(.+)\.rb\z})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')    { 'spec' }
 end

data/README.md

@@ -0,0 +1,20 @@
+MMVE
+====
+
+  Mass MV Edit: use your editor to move (rename) files.
+
+
+TODO
+----
+
+* Recurse directories:
+  - `-r some_dir` will rename `some_dir` entries.
+    `somedir/` could also be used
+  - `-rr some_dir` will rename all files found recursively in
+    `some_dir`
+
+* Handle conflicts in edited files
+
+* Make EDITOR configurable in the API, keep ENV['EDITOR'] as default.
+
+* Sort entries

data/Rakefile

@@ -1,11 +1,11 @@
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 
-desc 'Run all scenarios'
-Cucumber::Rake::Task.new(:features)
 
-desc 'Run all specs'
-RSpec::Core::RakeTask.new(:spec)
+task default: %i[features spec]
 
+Cucumber::Rake::Task.new :features do |t|
+  t.profile = 'quiet' if ENV.key? 'MMVE_CI'
+end
 
-task default: [:features, :spec]
+RSpec::Core::RakeTask.new

data/config/cucumber.yaml

@@ -0,0 +1,3 @@
+default: --no-source
+guard: --format pretty --quiet
+quiet: --format progress

data/features/step_definitions/editor_steps.rb

@@ -1,3 +1,3 @@
-Given(/^my editor is "(.*?)"$/) do |editor|
-  set_env('EDITOR', editor)
+Given /^my editor is "([^"]+)"$/ do |editor|
+  set_environment_variable 'EDITOR', editor
 end

data/features/step_definitions/filesystem_steps.rb

@@ -1,3 +1,3 @@
-Given(/^the following files exists:$/) do |paths|
-  paths.raw.flatten.each { |p| write_file p, '' }
+Given /^the following files exists:$/ do |paths|
+  paths.raw.flatten.each { |e| write_file e, '' }
 end

data/features/support/env_aruba.rb

@@ -2,13 +2,13 @@ module Cucumber
   class Runtime
     alias :old_step_match :step_match
 
-    def step_match(step_name, name_to_report = nil)
+    def step_match step_name, name_to_report = nil
       if step_name.include? ' must '
         name_to_report = step_name.dup
         step_name.gsub! ' must ', ' should '
       end
 
-      old_step_match(step_name, name_to_report)
+      old_step_match step_name, name_to_report
     end
   end
 end

data/features/support/env_cucumber-doc_string.rb

@@ -5,8 +5,8 @@ module Cucumber
     class DocString
       alias :old_initialize :initialize
 
-      def initialize(string, content_type)
-        old_initialize(string + "\n", content_type)
+      def initialize string, content_type
+        old_initialize string + $/, content_type
       end
     end
   end
@@ -15,8 +15,8 @@ module Cucumber
     class Pretty
       alias :old_doc_string :doc_string
 
-      def doc_string(string)
-        old_doc_string(string.chomp)
+      def doc_string string
+        old_doc_string string.chomp
       end
     end
   end

data/features/usage.feature

@@ -2,7 +2,7 @@ Feature: CLI usage
 
   Scenario: prints the usage when -h argument is given
     When I successfully run `mmve -h`
-    And the output must contain exactly:
+    Then the output must contain exactly:
       """
       Usage: mmve [ path ... ]
       """

data/lib/mmve/cli.rb

@@ -1,8 +1,8 @@
 module MMVE
   class CLI
-    USAGE = "Usage: #{File.basename $0} [ path ... ]"
+    USAGE = "Usage: #{File.basename $0} [ path ... ]".freeze
 
-    def initialize(arguments, stdout = $stdout)
+    def initialize arguments, stdout = $stdout
       @arguments  = arguments
       @stdout     = stdout
     end
@@ -14,14 +14,14 @@ module MMVE
     end
 
     def editor
-      @editor ||= Editor.new(ENV['EDITOR'])
+      @editor ||= Editor.new ENV['EDITOR']
     end
 
     def renamer
-      @renamer ||= Renamer.new(@arguments)
+      @renamer ||= Renamer.new @arguments
     end
 
-    private
+  private
 
     def print_usage_and_exit
       @stdout.puts USAGE

data/lib/mmve/editor.rb

@@ -1,19 +1,19 @@
+require 'tempfile'
+
 module MMVE
   class Editor
-    require 'tempfile'
-
-    def initialize(editor_command)
+    def initialize editor_command
       @editor_command = editor_command
     end
 
-    def edit(paths)
-      edited_content = with_temp_file(paths * "\n" + "\n") { |f| edit_file f }
-      edited_content.split "\n"
+    def edit paths
+      edited_content = with_temp_file(paths * $/ + $/) { |f| edit_file f }
+      edited_content.split $/
     end
 
-    def with_temp_file(content)
+    def with_temp_file content
       content_after = ''
-      Tempfile.open(File.basename($0 + '_')) do |f|
+      Tempfile.open File.basename $0 + ?_ do |f|
         f.write content
         f.rewind
         yield f
@@ -22,8 +22,8 @@ module MMVE
       content_after
     end
 
-    def edit_file(file)
-      system(*@editor_command.split, file.path)
+    def edit_file file
+      system *@editor_command.split, file.path
     end
   end
 end

data/lib/mmve/renamer.rb

@@ -1,16 +1,16 @@
 module MMVE
   class Renamer
     attr_reader :sources
-    attr_writer :destinations
+    attr_accessor :destinations
 
-    def initialize(paths)
+    def initialize paths
       @sources      = paths
       @destinations = @sources.dup
     end
 
     def execute!
       [@sources, @destinations].transpose.each do |e|
-        File.rename(*e) if e.uniq.count == 2
+        File.rename *e if e.uniq.count == 2
       end
     end
   end

data/lib/mmve/version.rb

@@ -1,3 +1,3 @@
 module MMVE
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'.freeze
 end

data/mmve.gemspec

@@ -1,24 +1,23 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH << lib unless $LOAD_PATH.include? lib
-require 'mmve/version'
+require File.expand_path('../lib/mmve/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name    = 'mmve'
-  s.version = MMVE::VERSION
-  s.summary = "mmve-#{MMVE::VERSION}"
+  s.name        = 'mmve'
+  s.version     = MMVE::VERSION
+  s.summary     = "mmve-#{MMVE::VERSION}"
   s.description = 'Mass MV Editor: move files with your favourite $EDITOR'
-  s.homepage = 'https://rubygems.org/gems/mmve'
+  s.license     = 'BSD-3-Clause'
+  s.homepage    = 'https://rubygems.org/gems/mmve'
 
-  s.authors = 'Thibault Jouan'
-  s.email   = 'tj@a13.fr'
+  s.authors     = 'Thibault Jouan'
+  s.email       = 'tj@a13.fr'
 
   s.files       = `git ls-files`.split $/
-  s.test_files  = s.files.grep /\A(spec|features)\//
-  s.executables = s.files.grep(/\Abin\//) { |f| File.basename(f) }
+  s.executables = 'mmve'
+  s.extra_rdoc_files = %w[README.md]
 
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'cucumber'
-  s.add_development_dependency 'aruba'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake',      '~> 10.4'
+  s.add_development_dependency 'rspec',     '~> 3.2'
+  s.add_development_dependency 'cucumber',  '~> 1.3'
+  s.add_development_dependency 'aruba',     '~> 0.6'
 end

data/spec/mmve/cli_spec.rb

@@ -1,50 +1,34 @@
-require 'spec_helper'
-
-describe MMVE::CLI do
+RSpec.describe MMVE::CLI do
   include ExitHelpers
 
-  let(:arguments) { [:some, :arguments] }
+  let(:arguments) { %i[some arguments] }
   let(:stdout)    { StringIO.new }
-  subject(:cli)   { MMVE::CLI.new(arguments, stdout) }
-
-  describe '#initialize' do
-    it 'assigns the arguments' do
-      expect(cli.instance_eval { @arguments }).to eq arguments
-    end
-
-    it 'assigns the standard output' do
-      expect(cli.instance_eval { @stdout }).to eq stdout
-    end
-
-    context 'when no stdout is specified' do
-      subject(:cli) { MMVE::CLI.new(arguments) }
-
-      it 'assigns $stdout as a default standard output' do
-        expect(cli.instance_eval { @stdout }).to be $stdout
-      end
-    end
-  end
+  subject(:cli)   { described_class.new arguments, stdout }
 
   describe '#run!' do
     it 'edits the renamer source paths' do
       renamer = double('renamer').as_null_object
       allow(cli).to receive(:renamer) { renamer }
-      expect(cli.editor).to receive(:edit).with(cli.renamer.sources)
+      expect(cli.editor)
+        .to receive(:edit)
+        .with cli.renamer.sources
       cli.run!
     end
 
     it 'assigns the edited source paths as the renamer destination paths' do
-      editor = double('editor')
+      editor = double 'editor'
       allow(cli).to receive(:editor) { editor }
       allow(editor).to receive(:edit) { arguments }
-      expect(cli.renamer).to receive(:destinations=).with(arguments)
+      expect(cli.renamer)
+        .to receive(:destinations=)
+        .with arguments
       cli.run!
     end
 
     it 'executes the renamer' do
       editor = double('editor').as_null_object
       allow(cli).to receive(:editor) { editor }
-      expect(cli.renamer).to receive(:execute!)
+      expect(cli.renamer).to receive :execute!
       cli.run!
     end
 
@@ -53,40 +37,16 @@ describe MMVE::CLI do
 
       it 'prints the usage' do
         trap_exit { cli.run! }
-        expect(stdout.string).to eq MMVE::CLI::USAGE + "\n"
+        expect(stdout.string).to eq <<-eoh
+Usage: rspec [ path ... ]
+        eoh
       end
 
       it 'exits successfully' do
-        expect { cli.run! }.to raise_error(SystemExit) do |e|
-          expect(e.code).to be 0
+        expect { cli.run! }.to raise_error SystemExit do |e|
+          expect(e.status).to be 0
         end
       end
     end
   end
-
-  describe '#editor' do
-    it 'builds an editor with current $EDITOR' do
-      expect(MMVE::Editor).to receive(:new).with(ENV['EDITOR'])
-      cli.editor
-    end
-
-    it 'returns the editor' do
-      editor = double('editor')
-      allow(MMVE::Editor).to receive(:new) { editor }
-      expect(cli.editor).to be editor
-    end
-  end
-
-  describe '#renamer' do
-    it 'builds a renamer with the paths given as argument' do
-      expect(MMVE::Renamer).to receive(:new).with(arguments)
-      cli.renamer
-    end
-
-    it 'returns the renamer' do
-      renamer = double('renamer')
-      allow(MMVE::Renamer).to receive(:new) { renamer }
-      expect(cli.renamer).to be renamer
-    end
-  end
 end

data/spec/mmve/editor_spec.rb

@@ -1,33 +1,29 @@
-require 'spec_helper'
-
-describe MMVE::Editor do
+RSpec.describe MMVE::Editor do
   let(:editor_command)  { 'some editor command' }
-  subject(:editor)      { MMVE::Editor.new(editor_command) }
-
-  describe '#initialize' do
-    it 'assigns the editor command' do
-      expect(editor.instance_eval { @editor_command }).to eq editor_command
-    end
-  end
+  subject(:editor)      { described_class.new editor_command }
 
   describe '#edit' do
     let(:paths)     { %w[some_path other_path] }
-    let(:paths_str) { paths * "\n" + "\n" }
+    let(:paths_str) { paths * $/ + $/ }
 
     it 'creates a temporary file with the paths as content' do
       expect(editor)
-        .to receive(:with_temp_file).with(paths_str).and_return(paths_str)
-      editor.edit(paths)
+        .to receive(:with_temp_file)
+        .with(paths_str)
+        .and_return paths_str
+      editor.edit paths
     end
 
     it 'sends the edit_file message with the temporary file' do
-      expect(editor).to receive(:edit_file).with(any_args())
-      editor.edit(paths)
+      expect(editor)
+        .to receive(:edit_file)
+        .with any_args
+      editor.edit paths
     end
 
     it 'returns the edited file paths as a list' do
       allow(editor).to receive(:with_temp_file) { paths_str }
-      expect(editor.edit(paths)).to eq paths
+      expect(editor.edit paths).to eq paths
     end
   end
 
@@ -35,21 +31,28 @@ describe MMVE::Editor do
     let(:content) { "some_content\n" }
 
     it 'opens a temporary file' do
-      expect(Tempfile).to receive(:open).with('rspec_')
+      expect(Tempfile)
+        .to receive(:open)
+        .with 'rspec_'
       editor.with_temp_file(content) { }
     end
 
     it 'it writes the content to the file' do
       file = double('file').as_null_object
-      allow(Tempfile).to receive(:open).and_yield(file)
-      expect(file).to receive(:write).with(content)
+      allow(Tempfile)
+        .to receive(:open)
+        .and_yield file
+      expect(file).to receive(:write).with content
       editor.with_temp_file(content) { }
     end
 
     it 'yields the block with the file as argument' do
       file = double('file').as_null_object
-      allow(Tempfile).to receive(:open).and_yield(file)
-      expect { |b| editor.with_temp_file(content, &b) }.to yield_with_args(file)
+      allow(Tempfile)
+        .to receive(:open)
+        .and_yield file
+      expect { |b| editor.with_temp_file content, &b }
+        .to yield_with_args file
     end
 
     it 'returns the temporary file content after yielding the block' do
@@ -61,11 +64,13 @@ describe MMVE::Editor do
   end
 
   describe '#edit_file' do
-    let(:file) { double('file', path: 'some_path') }
+    let(:file) { double 'file', path: 'some_path' }
 
     it 'executes the editor command with the file path as argument' do
-      expect(editor).to receive(:system).with(*editor_command.split, file.path)
-      editor.edit_file(file)
+      expect(editor)
+        .to receive(:system)
+        .with *editor_command.split, file.path
+      editor.edit_file file
     end
   end
 end

data/spec/mmve/renamer_spec.rb

@@ -1,35 +1,14 @@
-require 'spec_helper'
-
-describe MMVE::Renamer do
+RSpec.describe MMVE::Renamer do
   let(:sources)       { %w[some_path other_path] }
   let(:destinations)  { %w[renamed_path other_path] }
-  subject(:renamer)   { MMVE::Renamer.new(sources) }
-
-  describe '#initialize' do
-    it 'assigns the source paths' do
-      expect(renamer.instance_eval { @sources }).to eq sources
-    end
-
-    it 'assigns destination paths equivalent to source paths' do
-      expect(renamer.instance_eval { @destinations }).to eq sources
-    end
+  subject(:renamer)   { described_class.new sources }
 
-    it 'copies the assignated destinations paths' do
-      expect(renamer.instance_eval { @destinations }).to_not be sources
-    end
+  it 'assigns destination paths equivalent to source paths' do
+    expect(renamer.destinations).to eq sources
   end
 
-  describe '#sources' do
-    it 'returns the source paths' do
-      expect(renamer.sources).to eq sources
-    end
-  end
-
-  describe '#destinations=' do
-    it 'assigns the destination paths' do
-      renamer.destinations = destinations
-      expect(renamer.instance_eval { @destinations }).to eq destinations
-    end
+  it 'copies the assignated destinations paths' do
+    expect(renamer.destinations).not_to be sources
   end
 
   describe '#execute!' do
@@ -40,7 +19,8 @@ describe MMVE::Renamer do
 
       it 'renames the sources to the destinations' do
         expect(File)
-          .to receive(:rename).with(sources.first, destinations.first)
+          .to receive(:rename)
+          .with sources.first, destinations.first
         renamer.execute!
       end
     end
@@ -49,7 +29,7 @@ describe MMVE::Renamer do
       let(:destinations) { sources }
 
       it 'renames nothing' do
-        expect(File).not_to receive(:rename)
+        expect(File).not_to receive :rename
         renamer.execute!
       end
     end

metadata

@@ -1,93 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: mmve
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'Mass MV Editor: move files with your favourite $EDITOR'
+        version: '0.6'
+description: 'Mass MV Editor: move files with your favourite $EDITOR'
 email: tj@a13.fr
 executables:
 - mmve
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
-- .gitignore
-- Gemfile
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Guardfile
 - LICENSE
+- README.md
 - Rakefile
 - bin/mmve
+- config/cucumber.yaml
 - features/rename.feature
 - features/step_definitions/editor_steps.rb
 - features/step_definitions/filesystem_steps.rb
@@ -106,38 +101,27 @@ files:
 - spec/spec_helper.rb
 - spec/support/exit_helpers.rb
 homepage: https://rubygems.org/gems/mmve
-licenses: []
+licenses:
+- BSD-3-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.10
 signing_key: 
-specification_version: 3
-summary: mmve-0.1.1
-test_files:
-- features/rename.feature
-- features/step_definitions/editor_steps.rb
-- features/step_definitions/filesystem_steps.rb
-- features/support/env_aruba.rb
-- features/support/env_cucumber-doc_string.rb
-- features/usage.feature
-- spec/mmve/cli_spec.rb
-- spec/mmve/editor_spec.rb
-- spec/mmve/renamer_spec.rb
-- spec/spec_helper.rb
-- spec/support/exit_helpers.rb
+specification_version: 4
+summary: mmve-0.1.2
+test_files: []

data/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-eval File.read('Gemfile-custom.rb') if File.exist?('Gemfile-custom.rb')