diff_influence 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4d55ee171f05f93366111120e33f56a834b3e28
-  data.tar.gz: 9a804afacfabf149ddca92860e8f6a12f036f7de
+  metadata.gz: 5eba67ab25882f71a3576b52acbc8b381e0f7280
+  data.tar.gz: dae12e5394b4cf018482cb2bc718521526a11819
 SHA512:
-  metadata.gz: ee1fb841a6de0f192a6859070f098c991be007cff67bf59d58a476b7708654523941fcf094dbef3804e44b9ec5beefd8042f80eb9196827119486d41934a5364
-  data.tar.gz: 2bea09cf03472c98533206dec2c7f96ba8821e1d5caf31cd9d05e250994ab88e191fb7745a79d824b6934672137249b887baf9ca6f707ca3bb300dc0bf56554d
+  metadata.gz: dc91ec4e06ec21e54dafe2674e456dc8f35fa782003c6ab7f6452af6f2a41d40126eca393580ded039021b55d0d09df46e6d37c61a32ecdbc9cd5acb57917769
+  data.tar.gz: 46487ffedc69981a28b4f6b35eedd5e652bd55e16142ec308705574c4dd632692fac811a6839c2c924f5f39c4d59ab9551c24d8543e59296bdfe505c541b088b

data/.travis.yml

@@ -1,5 +1,23 @@
+branches:
+  only: 
+    - master
+    - release
+    - develop
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12.3
+    - 1.8.7
+    - 1.9.3
+    - 2.0.0
+    - 2.1.0
+    - 2.2.0
+    - 2.3.0
+    - 2.4.0
+before_install: gem install bundler
+cache:
+  directories:
+    - vendor/bundle
+install: bundle install --path=vendor/bundle
+script:
+    - ruby --version
+    - bundle exec rake spec

data/README.md

@@ -1,10 +1,14 @@
 # Diff Influence
 
+[![Build Status](https://travis-ci.org/metalels/diff_influence.svg?branch=master)](https://travis-ci.org/metalels/diff_influence)  
+[![Gem Version](https://badge.fury.io/rb/diff_influence.svg)](https://badge.fury.io/rb/diff_influence)  
+
 Search influence of git diff.
 
 ## Requirement ##
 
-* git ( use git diff command )
+* Git ( support only git diff command. )
+* Ruby ( support only Ruby 1.8.7 or later. )
 
 ## Installation ##
 
@@ -24,7 +28,7 @@ Or install it yourself as:
 
 ## Usage ##
 
-``
+```
 ==============================================================================
 []: optional
 
@@ -32,7 +36,6 @@ Usage: diff-influence [Options]
 
  Options:
 
- -p --commit commit_id,commit_id   git commit id(s) uses diff (default: none)
  -p --path path,path,...           path(s) to search file (default: app,lib)
  -e --ext  extension,extension,... extension(s) to search file (default: rb)
  -g --grep                         use grep command with OS
@@ -40,9 +43,10 @@ Usage: diff-influence [Options]
 
  Feature Options:
 
+ -c --commit commit_id,commit_id   git commit id(s) uses diff (default: none)
  -o --output path                  to output file (default: STDOUT)
 ==============================================================================
-``
+```
 
 ## Authors ##
 

data/bin/console

@@ -6,9 +6,10 @@ require "diff_influence"
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
-Pry.start
-
-#require "irb"
-#IRB.start
+if RUBY_VERSION < "1.9.0"
+  require "irb"
+  IRB.start
+else
+  require "pry"
+  Pry.start
+end

data/bin/convert_for_under_200.rb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+src = File.read "lib/diff_influence/core.rb"
+src = src.gsub(/(\w+):\s/, ':\1 => ')
+src = src.gsub(/\.lines/, '.lines.to_a')
+File.write "lib/diff_influence/core_1x.rb", src

data/lib/diff_influence/config.rb

@@ -9,7 +9,6 @@ Usage: diff_influence [Options]
 
  Options:
 
- -p --commit commit_id,commit_id   git commit id(s) uses diff (default: none)
  -p --path path,path,...           path(s) to search file (default: app,lib)
  -e --ext  extension,extension,... extension(s) to search file (default: rb)
  -g --grep                         use grep command with OS
@@ -17,6 +16,7 @@ Usage: diff_influence [Options]
 
  Feature Options:
 
+ -c --commit commit_id,commit_id   git commit id(s) uses diff (default: none)
  -o --output path                  to output file (default: STDOUT)
 ==============================================================================
     EOS
@@ -89,6 +89,7 @@ Usage: diff_influence [Options]
           self.exit_with_message 2, true
         end
       end
+      true
     end
   end
 end

data/lib/diff_influence/core.rb

@@ -1,6 +1,5 @@
 module DiffInfluence
   module Core
-    PREF_DIRS=["lib", "app"]
     EMeth=Struct.new(:name, :type, :raw, :index)
     EMeth.class_eval do
       def initialize(attr={})
@@ -11,6 +10,10 @@ module DiffInfluence
       end
     end
 
+    def self.debug_log(msg)
+      puts "[DEBUG] #{msg}" if DiffInfluence::Config.debug
+    end
+
     def self.git_status
       `git status | grep modified`
     end
@@ -23,24 +26,23 @@ module DiffInfluence
       `git --no-pager diff --no-ext-diff -U1000000 #{file_path}`
     end
 
-    def self.file(file_path)
-      File.read(file_path).lines
-    end
-
     def self.search_methods(file_path)
       methods = []
       last_method = nil
       cnt = 0
       lines = self.git_diff(file_path).lines
       lines.each_with_index do |line, idx|
-        last_method = lines[idx].split("def ").last.chomp.gsub("self\.","") if line =~ /(\s|\t)*def/
+        if line =~ /(\s|\t|;)def/ 
+          last_method = lines[idx].split("def ").last.chomp.gsub("self\.","")
+          self.debug_log "Method line => #{last_method}"
+        end
         case line
         when /\A\+\+\+/, /\A---/, /\Adiff/, /\Aindex/, /\A@@/
-          puts "Ignore line: #{line}" if DiffInfluence::Config.debug
+          self.debug_log "Ignore line => #{line}"
           next
         when /\A\+/, /\A\-/
           cnt += 1 if line =~ /\A\+/
-          puts "idx:#{idx}, cnt:#{cnt}, #{line}" if DiffInfluence::Config.debug
+          self.debug_log "idx:#{idx}, cnt:#{cnt}, #{line}"
 
           t = case line
               when /\A-(\s|\t)*def/
@@ -60,7 +62,7 @@ module DiffInfluence
           cnt += 1
         end
       end
-      puts methods if DiffInfluence::Config.debug
+      self.debug_log methods.to_s
       methods
     end
 

data/lib/diff_influence/core_1x.rb

@@ -0,0 +1,114 @@
+module DiffInfluence
+  module Core
+    EMeth=Struct.new(:name, :type, :raw, :index)
+    EMeth.class_eval do
+      def initialize(attr={})
+        self.name = attr[:name]
+        self.type = attr[:type]
+        self.raw = attr[:raw]
+        self.index = attr[:index]
+      end
+    end
+
+    def self.debug_log(msg)
+      puts "[DEBUG] #{msg}" if DiffInfluence::Config.debug
+    end
+
+    def self.git_status
+      `git status | grep modified`
+    end
+
+    def self.file_paths
+      @@files ||= self.git_status.lines.to_a.map{|line| line.split.last}
+    end
+
+    def self.git_diff(file_path)
+      `git --no-pager diff --no-ext-diff -U1000000 #{file_path}`
+    end
+
+    def self.search_methods(file_path)
+      methods = []
+      last_method = nil
+      cnt = 0
+      lines = self.git_diff(file_path).lines.to_a
+      lines.each_with_index do |line, idx|
+        if line =~ /(\s|\t|;)def/ 
+          last_method = lines[idx].split("def ").last.chomp.gsub("self\.","")
+          self.debug_log "Method line => #{last_method}"
+        end
+        case line
+        when /\A\+\+\+/, /\A---/, /\Adiff/, /\Aindex/, /\A@@/
+          self.debug_log "Ignore line => #{line}"
+          next
+        when /\A\+/, /\A\-/
+          cnt += 1 if line =~ /\A\+/
+          self.debug_log "idx:#{idx}, cnt:#{cnt}, #{line}"
+
+          t = case line
+              when /\A-(\s|\t)*def/
+                "remove"
+              when /\A\+(\s|\t)*def/
+                "add"
+              else
+                "effect"
+              end
+          methods.push EMeth.new(
+            :name => last_method,
+            :type => t,
+            :raw => line,
+            :index => cnt
+          )
+        else
+          cnt += 1
+        end
+      end
+      self.debug_log methods.to_s
+      methods
+    end
+
+    def self.os_grep(keyword="")
+      DiffInfluence::Config.search_paths.each do |pd|
+        puts `grep -r -E '(\\.|@)#{keyword}(\\s|\\()' #{pd}`
+      end
+    end
+
+    def self.native_grep(keyword="")
+      self.files.each do |file|
+        File.readlines(file).each_with_index do |line, idx|
+          if line =~ /(\.|@)#{keyword}(\s|\()/
+            puts "#{file}:#{idx+1} #{line}"
+          end
+        end
+      end
+    end
+
+    def self.files
+      @@files ||= Dir.glob(DiffInfluence::Config.search_paths.map{|d| "#{d}/**/**.{#{DiffInfluence::Config.search_extensions.join(",")}}"})
+    end
+
+    def self.influence_search(file_path)
+      searched_methods = []
+      self.search_methods(file_path).each do |method|
+        if method.name.nil? || method.name.empty? || searched_methods.include?(method.name)
+          next
+        else
+          searched_methods.push method.name
+        end
+        puts "###  Searching method[#{method.name}] (from #{file_path}:#{method.index})"
+        if DiffInfluence::Config.os_grep
+          self.os_grep method.name
+        else
+          self.native_grep method.name
+        end
+        puts
+      end
+    end
+
+    def self.exec
+      self.file_paths.each do |fp|
+        self.influence_search fp
+      end
+      exit 0
+    end
+  end
+end

data/lib/diff_influence/version.rb

@@ -1,3 +1,3 @@
 module DiffInfluence
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/diff_influence.rb

@@ -1,3 +1,8 @@
 require "diff_influence/version"
-require "diff_influence/core"
 require "diff_influence/config"
+
+if RUBY_VERSION < "2.0.0"
+  require "diff_influence/core_1x"
+else
+  require "diff_influence/core"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff_influence
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - metalels
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,12 +82,14 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/convert_for_under_200.rb
 - bin/setup
 - diff_influence.gemspec
 - exe/diff-influence
 - lib/diff_influence.rb
 - lib/diff_influence/config.rb
 - lib/diff_influence/core.rb
+- lib/diff_influence/core_1x.rb
 - lib/diff_influence/version.rb
 homepage: https://github.com/metalels/diff_influence
 licenses: []
@@ -108,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: search diff influence.