aidir 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7eaf6330320e4fdf216523d062548d9aacd04b1
-  data.tar.gz: 860bb28473a75a9af18664b4129e58e926126685
+  metadata.gz: c4b9543fd9053e1f38ef30b9905465846c1b6dcf
+  data.tar.gz: 50e84bdfd063f8cd6dac64ed71d5ca24fd0cdb15
 SHA512:
-  metadata.gz: c4e6b55264d0286d1c20f2dd2af865e794fbb99794115467c0449bbc94041231a62227866a940cf0cbb7dc0cad0bcb8e956028f2c0954aa8c6bcc1071d85b47f
-  data.tar.gz: ed4ccf478e8f37fa85c458f1891359fd6bf9d5c27b769cd73be38f115f1ba4caf3d8b1ed9cb76befad8ebc1ff83df7470f112f0680e9698bb840ecd8c364e31f
+  metadata.gz: 75b9ee4b9d739b981ecda663ad793740f14b0c576a1040c3715eab677324f9e1b054ec408eb4e1ddf04cd1af10ffb4b6390f1de50024be317fa339e4307e9dad
+  data.tar.gz: bdcefa6ba0a789632a226c57c0543d9de86ff8f0f55f09a3da15f37dd99733d4036534eae132a7249145f6165d5c5145ea211653b23eb12a50fdd03018f18b60

data/bin/aidir

@@ -2,4 +2,5 @@
 
 require 'aidir'
 
-aidir = Aidir::start
+aidir = Aidir.new
+aidir.start

data/lib/aidir.rb

@@ -1,35 +1,42 @@
 require_relative 'aidir/git'
-require_relative 'aidir/flog'
+require_relative 'aidir/aidir_flog'
 require_relative 'aidir/formatter'
 require_relative 'aidir/scoreboard'
 require 'open3'
 
 class Aidir
 
-  def self.start
-    @errors = []
-    @results = {}
-    git = nil
-    files = nil
-
-    git = Git.new(@errors)
-    git.is_repository?
-    if @errors.any?
-      puts @errors
-      return
+  def initialize
+    start
+  end
+
+  def start
+    git_errors = prepare_git
+    if git_errors
+      puts git_errors
+      return git_errors
     end
 
-    files = git.ruby_files
+    scoreboard = Scoreboard.new(get_flog_results)
+    print scoreboard.results
+    return scoreboard.results
+  end
 
-    files.each do |file|
-      flog = Flog.new(file)
-      @results[file] = flog.analyze
+  def get_flog_results
+    results = {}
+
+    @git.ruby_files.each do |file|
+      flog = AidirFlog.new(file)
+      results[file] = flog.analyze
     end
+    @git.clear_cached_files
 
-    git.clear_cached_files
+    results
+  end
 
-    scoreboard = Scoreboard.new(@results)
-    print scoreboard.results
+  def prepare_git
+    @git = Git.new
+    return @git.errors unless @git.is_repository?
   end
 
 end

data/lib/aidir/{flog.rb → aidir_flog.rb}

@@ -1,4 +1,6 @@
-class Flog
+require 'flog_cli'
+
+class AidirFlog
 
   def initialize(filename)
     @branch = filename
@@ -31,9 +33,13 @@ class Flog
   end
 
   def flog_file(filename)
-    Open3.popen3("flog -a #{filename}") do |_, stdout, stderr|
-      stdout.read
-    end
+    out = StringIO.new
+    args = ['-a', filename]
+    options = FlogCLI.parse_options(args)
+    flogger = FlogCLI.new(options)
+    flogger.flog(args)
+    flogger.report(out)
+    out.string
   end
 
   def raw_to_hash(data)

data/lib/aidir/git.rb

@@ -1,16 +1,18 @@
 class Git
 
-  def initialize(errors)
-    @errors = errors
+  attr_accessor :errors, :changed_files
+
+  def initialize
+    @errors = []
     @changed_files = []
   end
 
   def is_repository?
-    error = false
     Open3.popen3('git rev-parse') do |_, _, stderr|
       error = stderr.read
       @errors << error unless error.empty?
     end
+    @errors.empty?
   end
 
   def ruby_files
@@ -30,6 +32,8 @@ class Git
 
   def all_changed_files
     Open3.popen3("git diff --name-only origin/master...") do |_, stdout, stderr|
+      error = stderr.read
+      @errors << error and return unless error.empty?
       out = stdout.read
       @changed_files = out.split("\n") unless out.empty?
     end
@@ -41,7 +45,8 @@ class Git
 
   def cache_files
     @changed_files.each do |file|
-      File.open(temp(file), 'w') do |f|
+      Dir.mkdir 'tmp' unless File.directory? 'tmp'
+      File.open(temp(file), 'w+') do |f|
         f.write(remote_file_contents(file))
       end
     end
@@ -58,5 +63,4 @@ class Git
     "#{Dir.pwd}/tmp/aidir_#{safe_filename}"
   end
 
-
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: aidir
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adomas Sliužinskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: flog
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: '2.14'
 description: 'aidir - Am I Doing It Right: track and improve your Flog score before
   merging code to master by getting Flog score differences between current branch
   and master branch'
@@ -47,12 +47,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/aidir
 - lib/aidir.rb
-- lib/aidir/flog.rb
+- lib/aidir/aidir_flog.rb
 - lib/aidir/formatter.rb
 - lib/aidir/git.rb
 - lib/aidir/scoreboard.rb
-- bin/aidir
 homepage: http://github.com/adomas-s/aidir
 licenses:
 - MIT
@@ -63,17 +63,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Shows Flog score diff of current git branch vs. origin/master