shelly 0.1.14 → 0.1.15

data/lib/shelly/structure_validator.rb

@@ -44,7 +44,7 @@ module Shelly
     private
 
     def gems
-      return [] unless gemfile? or gemfile_lock?
+      return [] unless gemfile? && gemfile_lock?
       definition = Bundler::Definition.build(@gemfile_path,
         @gemfile_lock_path, nil)
       @gems ||= definition.specs.map(&:name)
@@ -53,7 +53,11 @@ module Shelly
     def repo_paths
       @repo_paths ||= begin
         repo = Grit::Repo.new(".")
-        repo.status.map(&:path)
+        # Select files from repo which are unchanged, added or modified
+        # and then return their paths
+        repo.status.files.map(&:last).select { |status|
+          status.type.nil? || status.type == 'A' || status.type == 'M'
+        }.map(&:path)
       end
     end
   end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/spec/shelly/cli/main_spec.rb

@@ -1290,7 +1290,7 @@ We have been notified about it. We will be adding new resources shortly")
       Shelly::App.stub(:inside_git_repository?).and_return(true)
       Bundler::Definition.stub_chain(:build, :specs, :map) \
         .and_return(["thin"])
-      Grit::Repo.stub_chain(:new, :status, :map) \
+      Shelly::StructureValidator.any_instance.stub(:repo_paths) \
         .and_return(["config.ru", "Gemfile", "Gemfile.lock"])
     end
 
@@ -1307,7 +1307,7 @@ We have been notified about it. We will be adding new resources shortly")
 
     context "when gemfile doesn't exist" do
       it "should show that Gemfile doesn't exist" do
-        Grit::Repo.stub_chain(:new, :status, :map).and_return([])
+        Shelly::StructureValidator.any_instance.stub(:repo_paths).and_return([])
         $stdout.should_receive(:puts).with("  #{red("✗")} Gemfile is missing in git repository")
         invoke(@main, :check)
       end
@@ -1322,7 +1322,7 @@ We have been notified about it. We will be adding new resources shortly")
 
     context "when gemfile doesn't exist" do
       it "should show that Gemfile doesn't exist" do
-        Grit::Repo.stub_chain(:new, :status, :map).and_return([])
+        Shelly::StructureValidator.any_instance.stub(:repo_paths).and_return([])
         $stdout.should_receive(:puts).with("  #{red("✗")} Gemfile is missing in git repository")
         invoke(@main, :check)
       end
@@ -1352,7 +1352,7 @@ We have been notified about it. We will be adding new resources shortly")
 
     context "when config.ru doesn't exist" do
       it "should show that config.ru is neccessary" do
-        Grit::Repo.stub_chain(:new, :status, :map).and_return([])
+        Shelly::StructureValidator.any_instance.stub(:repo_paths).and_return([])
         $stdout.should_receive(:puts).with("  #{red("✗")} File config.ru is missing")
         invoke(@main, :check)
       end

data/spec/shelly/structure_validator_spec.rb

@@ -3,9 +3,10 @@ require "spec_helper"
 describe Shelly::StructureValidator do
   before do
     @validator = Shelly::StructureValidator.new
-    Grit::Repo.stub_chain(:new, :status).and_return([
-      mock(:path => "Gemfile"), mock(:path => "Gemfile.lock")
-    ])
+    statuses = [mock(:type => nil, :path => "Gemfile"),
+      mock(:type => nil, :path => "Gemfile.lock"),
+      mock(:type => nil, :path => "config.ru")]
+    Grit::Repo.stub_chain(:new, :status, :files, :map => statuses)
   end
 
   describe "#gemfile?" do
@@ -17,8 +18,9 @@ describe Shelly::StructureValidator do
 
     context "when Gemfile doesn't exist" do
       it "should return false" do
-        Grit::Repo.stub_chain(:new, :status) \
-          .and_return([mock(:path => "Gemfile.lock")])
+        Grit::Repo.stub_chain(:new, :status, :files,
+          :map => [mock(:type => 'D', :path => "Gemfile"),
+            mock(:type => nil, :path => "Gemfile.lock")])
         @validator.gemfile?.should == false
       end
     end
@@ -33,19 +35,15 @@ describe Shelly::StructureValidator do
 
     context "when Gemfile.lock doesn't exist" do
       it "should return false" do
-        Grit::Repo.stub_chain(:new, :status) \
-          .and_return([mock(:path => "Gemfile")])
+        Grit::Repo.stub_chain(:new, :status, :files,
+          :map => [mock(:type => nil, :path => "Gemfile"),
+            mock(:type => 'D' , :path => "Gemfile.lock")])
         @validator.gemfile_lock?.should == false
       end
     end
   end
 
   describe "#config_ru?" do
-    before do
-      Grit::Repo.stub_chain(:new, :status) \
-        .and_return([mock(:path => "config.ru")])
-    end
-
     context "when config.ru exists" do
       it "should return true" do
         @validator.config_ru?.should == true
@@ -54,7 +52,7 @@ describe Shelly::StructureValidator do
 
     context "when config.ru doesn't exist" do
       it "should return false" do
-        Grit::Repo.stub_chain(:new, :status).and_return([])
+        Grit::Repo.stub_chain(:new, :status, :files, :map => [])
         @validator.config_ru?.should == false
       end
     end
@@ -74,5 +72,19 @@ describe Shelly::StructureValidator do
     it "should return false if gem is missing" do
       @validator.gem?("rake").should be_false
     end
+
+    context "when gemfile doesn't exist" do
+      it "should return false" do
+        @validator.stub(:gemfile? => false)
+        @validator.gem?("thin").should be_false
+      end
+    end
+
+    context "when gemfile.lock doesn't exist" do
+      it "should return false" do
+        @validator.stub(:gemfile_lock? => false)
+        @validator.gem?("thin").should be_false
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec