ruby-edit 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10f6d715be0881ed3b09997e86981c4a99b7f13ef8170876e71640bf67698876
-  data.tar.gz: e58452855508b87da7a6cf53ea4f0fba0830609bcd231dc3d48d5ffb2112484f
+  metadata.gz: e90b8a2ab82a34d5d474f65a5d482d7a48e93a9a3894bcc29847cafc79e48653
+  data.tar.gz: 35fa3805fceff2afe04669b13fb2c879c389e763b16192421e5c1c48ef7fec59
 SHA512:
-  metadata.gz: d4f11c81fef9ad1fe6c3a595d7cc4779f831b9251c3cbefd1864aa24e55da67411a0e7019202094ffd0c6ea73e5fa8d9f6ff82f17821590d00c28a457a7273f5
-  data.tar.gz: d285a109147ac4993b7bcd0d3e6d90d128773e3edcd45e8650df12ba26150dccc6dac2238179459616416fe5f6e3d8b6feb8bcd4871a4d89371010f1b211e737
+  metadata.gz: 2e67fef358e9144c692467bee50d66a187bb96ac6de7c4324f3dc8bfe6714c6324ec658490019b2d469b2ecbc1d7975742201ffa3e337edc80ec2657d3047b93
+  data.tar.gz: 27ada5b5739492de7fbe35c6c96bd1f0e36d077a779dfd7f9ed7860fb7b52e4679f46daeb4a3c6188c589ccb6de6f65e87ac48a948a35dad537ec6549b21e3ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-edit (0.3.1)
+    ruby-edit (1.0.0)
       pastel (~> 0.7.2)
       thor (~> 0.20.0)
       tty-color (~> 0.4.2)

data/lib/ruby_edit/cli.rb

@@ -18,21 +18,6 @@ module RubyEdit
     end
     map %w[--version -v] => :version
 
-    desc 'grep', 'search for an expression in your directory'
-    method_option :expression, aliases: %w[-e --expression], type: :string,
-                               desc: 'the grep expression', required: true
-    method_option :path, aliases: %w[-p --path], type: :string, desc: 'the path you want to search'
-    def grep(*)
-      if options[:help]
-        invoke :help, ['grep']
-      else
-        require_relative 'commands/grep'
-        RubyEdit::Commands::Grep.new(options).execute
-      end
-    end
-
-    map %w[--grep -g] => :grep
-
     desc 'configure', 'set and read your settings'
     method_option :help, aliases: '-h', type: :boolean, desc: 'Display useage information'
     method_option :editor, aliases: %w[-e --editor], type: :string,
@@ -50,7 +35,7 @@ module RubyEdit
 
     map %w[--configure -c] => :configure
 
-    desc 'edit', '[Default] Perform a grep and edit the changes in one file'
+    desc 'edit', 'Perform a grep and edit the changes in one file'
     method_option :expression, aliases: %w[-e --expression], type: :string,
                                desc: 'the grep expression', required: true
     method_option :path, aliases: %w[-p --path], type: :string, desc: 'the path you want to search'
@@ -64,8 +49,6 @@ module RubyEdit
         RubyEdit::Commands::Edit.new(options).execute
       end
     end
-
-    default_task :edit
   end
 end
 

data/lib/ruby_edit/configuration.rb

@@ -19,11 +19,15 @@ module RubyEdit
     end
 
     def grep_options
-      @config.fetch(:grep_options) || 'ir'
+      options = @config.fetch(:grep_options) || 'ir'
+      # The n option is needed for edited changes to be applied, so it needs to be added here
+      # automatically
+      "#{options}n"
     end
 
     def grep_options=(grep_options)
-      @config.set(:grep_options, value: grep_options)
+      # All occurences of n are removed, as n is autamatically added when the options are fetched.
+      @config.set(:grep_options, value: grep_options.gsub('n', ''))
       write
     end
 

data/lib/ruby_edit/grep.rb

@@ -9,6 +9,7 @@ module RubyEdit
     def initialize(options)
       @path       = options[:path] || '*'
       @expression = options[:expression]
+      @config     = RubyEdit.config
     end
 
     def search(output: $stdout, errors: $stderr)
@@ -16,7 +17,7 @@ module RubyEdit
         output.puts 'No expression given'
         return false
       end
-      @result = run "grep -irn #{@path} -e '#{@expression}'" do |out, err|
+      @result = run "grep -#{@config.grep_options} #{@path} -e '#{@expression}'" do |out, err|
         errors << err if err
       end
     rescue TTY::Command::ExitError => error

data/lib/ruby_edit/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module RubyEdit
-  VERSION = '0.3.1'
+  VERSION = '1.0.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-edit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - finn-francis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -376,7 +376,6 @@ files:
 - lib/ruby_edit/commands/.gitkeep
 - lib/ruby_edit/commands/configure.rb
 - lib/ruby_edit/commands/edit.rb
-- lib/ruby_edit/commands/grep.rb
 - lib/ruby_edit/configuration.rb
 - lib/ruby_edit/editor.rb
 - lib/ruby_edit/grep.rb

data/lib/ruby_edit/commands/grep.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'ruby_edit/grep'
-
-module RubyEdit
-  module Commands
-    class Grep
-      def initialize(options)
-        @options = options
-        @grep = RubyEdit::Grep.new(@options)
-      end
-
-      def execute(output: $stdout)
-        @result = @grep.search(output: output)
-        output.puts 'OK'
-      end
-    end
-  end
-end
-