phare 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d1e596a5d40fef1d29fa89cd662336f7fd45e7
-  data.tar.gz: 81dddc44763f470efd54222f21b72f48251be8fa
+  metadata.gz: a4252890c78249696e509dff17d5e00f85d7b7e0
+  data.tar.gz: 0d8df6eff8c70b1e2979cae85e2963ef36d8ba39
 SHA512:
-  metadata.gz: ce38e47371b89624a02538c0cca7a08ab1b15874f6fc566f2450f8e992a2e5ca3943b883a4771f60f4d8dbf6a36479fa1cc86e4790b59afe2ff2298912958b18
-  data.tar.gz: 073eeb502d9612627efedf47a559ded08803378b3c72235819d0fce5e2e245afa6ff89cedf8768db12219a9413b76ccdcc21d95938b50286790e57dac88e5ad1
+  metadata.gz: 15fc957a15daf979910740aeeb670691baacfc85b2a8f094cecf983c8fd717a16321d77f0cf941a57f221b158dbb00db4d49b6f1ce1137b0ce994eec3b9e9e56
+  data.tar.gz: 3dce84427d6f0d9947c96244dd928cadf5b9a9acf984ec217d752350df0c67d9a067ad0e854780807ad23900aa340ca7c3bce06e9c6a1ffa9f9046ec354bccd5

data/lib/phare.rb

@@ -3,6 +3,7 @@ require 'optparse'
 require 'phare/version'
 
 require 'phare/cli'
+require 'phare/git'
 
 require 'phare/check'
 require 'phare/check/rubocop'

data/lib/phare/check.rb

@@ -1,6 +1,10 @@
 module Phare
   class Check
-    attr_reader :status, :command
+    attr_reader :status, :command, :tree
+
+    def initialize(directory, options = {})
+      @tree = Git.new(@extensions, options)
+    end
 
     def run
       if should_run?
@@ -20,19 +24,6 @@ module Phare
       end
     end
 
-    def tree_changed?
-      @options[:diff] && tree_changes && tree_changes.any?
-    end
-
-    def tree_changes
-      @modified_files ||= Phare.system_output('git status -s').split("\n").reduce([]) do |memo, diff|
-        filename = diff.split(' ').last
-
-        memo << filename if @extensions.include?(File.extname(filename))
-        memo
-      end
-    end
-
     def should_run?
       should_run = binary_exists?
 
@@ -41,7 +32,7 @@ module Phare
       end
 
       if @options[:diff]
-        should_run = should_run && tree_changed?
+        should_run = should_run && @tree.changed?
       end
 
       should_run

data/lib/phare/check/jscs.rb

@@ -9,11 +9,13 @@ module Phare
         @path = File.expand_path("#{directory}app/assets", __FILE__)
         @extensions = %w(.js)
         @options = options
+
+        super
       end
 
       def command
-        if tree_changed?
-          "jscs #{tree_changes.join(' ')}"
+        if @tree.changed?
+          "jscs #{@tree.changes.join(' ')}"
         else
           "jscs #{@path}"
         end
@@ -30,7 +32,7 @@ module Phare
       end
 
       def argument_exists?
-        tree_changed? || Dir.exists?(@path)
+        @tree.changed? || Dir.exists?(@path)
       end
 
       def print_banner

data/lib/phare/check/jshint.rb

@@ -8,13 +8,15 @@ module Phare
         @config = File.expand_path("#{directory}.jshintrc", __FILE__)
         @path = File.expand_path("#{directory}app/assets/javascripts", __FILE__)
         @glob = File.join(@path, '**/*')
-        @extensions = %w(.js .es6.js)
+        @extensions = %w(.js .es6)
         @options = options
+
+        super
       end
 
       def command
-        if tree_changed?
-          "jshint --config #{@config} --extra-ext #{@extensions.join(',')} #{tree_changes.join(' ')}"
+        if @tree.changed?
+          "jshint --config #{@config} --extra-ext #{@extensions.join(',')} #{@tree.changes.join(' ')}"
         else
           "jshint --config #{@config} --extra-ext #{@extensions.join(',')} #{@glob}"
         end
@@ -31,7 +33,7 @@ module Phare
       end
 
       def arguments_exists?
-        tree_changed? || Dir.exists?(@path)
+        @tree.changed? || Dir.exists?(@path)
       end
 
       def print_banner

data/lib/phare/check/rubocop.rb

@@ -6,11 +6,13 @@ module Phare
         @path = directory
         @extensions = %w(.rb)
         @options = options
+
+        super
       end
 
       def command
-        if tree_changed?
-          "rubocop #{tree_changes.join(' ')}"
+        if @tree.changed?
+          "rubocop #{@tree.changes.join(' ')}"
         else
           'rubocop'
         end

data/lib/phare/check/scss_lint.rb

@@ -8,11 +8,13 @@ module Phare
         @path = File.expand_path("#{directory}app/assets/stylesheets", __FILE__)
         @extensions = %w(.css .scss)
         @options = options
+
+        super
       end
 
       def command
-        if tree_changed?
-          "scss-lint #{tree_changes.join(' ')}"
+        if @tree.changed?
+          "scss-lint #{@tree.changes.join(' ')}"
         else
           "scss-lint #{@path}"
         end
@@ -25,7 +27,7 @@ module Phare
       end
 
       def arguments_exists?
-        tree_changed? || Dir.exists?(@path)
+        @tree.changed? || Dir.exists?(@path)
       end
 
       def print_banner

data/lib/phare/git.rb

@@ -0,0 +1,24 @@
+module Phare
+  class Git
+    def initialize(extensions, options)
+      @extensions = extensions
+      @options = options
+    end
+
+    def changed?
+      @options[:diff] && changes.any?
+    end
+
+    def changes
+      @changes ||= Phare.system_output('git status -s').split("\n").reduce([]) do |memo, diff|
+        filename = diff.split(' ').last
+
+        if diff =~ /^[^D]{2}/ && @extensions.include?(File.extname(filename))
+          memo << filename
+        end
+
+        memo
+      end
+    end
+  end
+end

data/lib/phare/version.rb

@@ -1,3 +1,3 @@
 module Phare
-  VERSION = '0.5'
+  VERSION = '0.5.1'
 end

data/spec/phare/check/jscs_spec.rb

@@ -56,7 +56,7 @@ describe Phare::Check::JSCS do
         let(:command) { "jscs #{files.join(' ')}" }
         let(:jscs_exit_status) { 1337 }
 
-        before { expect(check).to receive(:tree_changes).and_return(files).at_least(:once) }
+        before { expect(check.tree).to receive(:changes).and_return(files).at_least(:once) }
 
         it { expect { run! }.to change { check.status }.to(jscs_exit_status) }
       end

data/spec/phare/check/rubocop_spec.rb

@@ -47,7 +47,7 @@ describe Phare::Check::Rubocop do
         let(:command) { "rubocop #{files.join(' ')}" }
         let(:rubocop_exit_status) { 1337 }
 
-        before { expect(check).to receive(:tree_changes).and_return(files).at_least(:once) }
+        before { expect(check.tree).to receive(:changes).and_return(files).at_least(:once) }
 
         it { expect { run! }.to change { check.status }.to(rubocop_exit_status) }
       end

data/spec/phare/check/scss_lint_spec.rb

@@ -53,7 +53,7 @@ describe Phare::Check::ScssLint do
         let(:command) { "scss-lint #{files.join(' ')}" }
         let(:scsslint_exit_status) { 1337 }
 
-        before { expect(check).to receive(:tree_changes).and_return(files).at_least(:once) }
+        before { expect(check.tree).to receive(:changes).and_return(files).at_least(:once) }
 
         it { expect { run! }.to change { check.status }.to(scsslint_exit_status) }
       end

data/spec/phare/git_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Phare::Git do
+  let(:extensions) { ['.rb'] }
+  let(:options) { { diff: true } }
+  let(:git) { described_class.new(extensions, options) }
+
+  describe :changed? do
+    context 'with --diff options' do
+      before { expect(git).to receive(:changes).and_return(changes) }
+
+      context 'with changes' do
+        let(:changes) { ['foo.rb'] }
+
+        it { expect(git.changed?).to eq(true) }
+      end
+
+      context 'without changes' do
+        let(:changes) { [] }
+
+        it { expect(git.changed?).to eq(false) }
+      end
+    end
+
+    context 'without --diff options' do
+      let(:options) { { diff: false } }
+
+      it { expect(git.changed?).to eq(false) }
+    end
+  end
+
+  describe :changes do
+    before { expect(Phare).to receive(:system_output).with('git status -s').and_return(tree) }
+
+    context 'with empty tree' do
+      let(:tree) { '' }
+
+      it { expect(git.changes).to eq([]) }
+    end
+
+    context 'with untracked file' do
+      let(:tree) { "?? foo.rb" }
+
+      it { expect(git.changes).to eq(['foo.rb']) }
+    end
+
+    context 'with added file' do
+      let(:tree) { "A  foo.rb\nAM bar.rb" }
+
+      it { expect(git.changes).to eq(['foo.rb', 'bar.rb']) }
+    end
+
+    context 'with modified file' do
+      let(:tree) { "M  foo.rb\nDM bar.rb" }
+
+      it { expect(git.changes).to eq(['foo.rb']) }
+    end
+
+    context 'with deleted file' do
+      let(:tree) { " D foo.rb\nMD bar.rb" }
+
+      it { expect(git.changes).to eq([]) }
+    end
+  end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: phare
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta2
 description: Phare looks into your files and check for (Ruby, JavaScript and SCSS)
@@ -61,10 +61,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -78,6 +78,7 @@ files:
 - lib/phare/check/scss_lint.rb
 - lib/phare/check_suite.rb
 - lib/phare/cli.rb
+- lib/phare/git.rb
 - lib/phare/version.rb
 - phare.gemspec
 - spec/phare/check/jscs_spec.rb
@@ -86,6 +87,7 @@ files:
 - spec/phare/check/scss_lint_spec.rb
 - spec/phare/check_suite_spec.rb
 - spec/phare/cli_spec.rb
+- spec/phare/git_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mirego/phare
 licenses:
@@ -97,17 +99,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.1.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Phare looks into your files and check for (Ruby, JavaScript and SCSS) coding
@@ -119,4 +121,5 @@ test_files:
 - spec/phare/check/scss_lint_spec.rb
 - spec/phare/check_suite_spec.rb
 - spec/phare/cli_spec.rb
+- spec/phare/git_spec.rb
 - spec/spec_helper.rb