nit 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f516d5091e63c8591e12facb8e6971d19116c8bc
-  data.tar.gz: c76c5d753527a5568bce39965197aa5c1ddf34cc
+  metadata.gz: 8ce40cb00fbd0507889d52bf61b057450c613caa
+  data.tar.gz: 560e59c303756db72f2ceab112c9b59c35dd608e
 SHA512:
-  metadata.gz: 1f3392cec82272850b8dd83bf405deb84c85e3c00746fc744e4d2b371675f91f782a32f7f75c094d1ceb51e918f5b132f45fdafff002768047de43a3e9e65c5a
-  data.tar.gz: afd638bc8f316a9982ae688137edaec506807d7a42935e69689eed73e0e0a58a272333ce054aa191a2b1b5014976b8f6d92a2480d60ef969a448317fd66bf994
+  metadata.gz: 7b9f0619293a6c4ae41ac59b8448a17000dab8aff956ed69e424831a234b79d124a463946e9b0531046860cf74f113514ab93ad02a2727067d781854046df6db
+  data.tar.gz: 5875f64c730b320ae5b3bb6c716c80f479cd899a034b72ef6ab41410310a19acb506b89b758ecba685a39acda2066f3711c31234f954a7446fc113058d27062c

data/CHANGES.md

@@ -1,6 +1,6 @@
 ## 0.0.5
 
-
+* Make nit compatible with a git upgrade where the status command doesn't prepend lines with a hash (#) anymore (as seen in git 1.8.5.2).
 
 ## 0.0.4
 

data/lib/nit/lines.rb

@@ -31,8 +31,8 @@ module Nit
   #private
     def file_patterns
       {
-        modified: /#\tmodified:(.+)/,
-        new: /#\t((?!modified:).+)/
+        modified: /#?\tmodified:(.+)/,
+        new: /#?\t((?!modified:).+)/
       }
     end
   end

data/lib/nit/version.rb

@@ -1,3 +1,3 @@
 module Nit
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/nit.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor", "~> 0.18.1"
+  spec.add_dependency "thor", '~> 0.18', '>= 0.18.1'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/nit_test.rb

@@ -25,6 +25,8 @@ class NitTest < MiniTest::Spec
       `mkdir stage`
       `cp -R git stage/.git`
       `cp files/* stage/`
+
+      yield if block_given?
     end
 
     Dir.chdir "test/dummies/stage" do
@@ -58,6 +60,19 @@ class ArbitraryGitCommandsTest < NitTest
     output.must_match "1 file changed" # TODO: check if correct file was commited.
   end
 
+  # FIXME: with one changed, one new file!!!
+  it "what" do
+    output = nit(' ') do
+      `touch stage/new_file`
+      `cd stage && git add stage/new_file`
+    end
+    puts output
+    output.must_match "] fixing it\n"
+  end
+
+
+
+
   # it "allows -m after file indices" do
   #   output = nit(' co ab -m add something 4 u')
   #   puts output

data/test/status_test.rb

@@ -20,6 +20,15 @@ class StatusTest < MiniTest::Spec
       console.must_match "[3] new.rb"
       console.must_match "[5] db/migrate/"
     end
+
+    it "processes `git status` without #" do
+      console = subject.call([], output)
+      console.must_match "modified: [0]    on_stage.rb"
+      console.must_match "modified: [1]    staged.rb"
+      console.must_match "[2] brandnew.rb"
+      console.must_match "[3] new.rb"
+      console.must_match "[5] db/migrate/"
+    end
   end
 
   describe "char indexing" do

data/test/test_helper.rb

@@ -21,4 +21,24 @@ MiniTest::Spec.class_eval do
     no changes added to commit (use "git add" and/or "git commit -a")
     EOF
   end
+
+  let (:hashless_output) do <<-EOF
+    On branch master
+    Changes not staged for commit:
+      (use "git add <file>..." to update what will be committed)
+      (use "git checkout -- <file>..." to discard changes in working directory)
+
+    \tmodified:   on_stage.rb
+    \tmodified:   staged.rb
+
+    Untracked files:
+      (use "git add <file>..." to include in what will be committed)
+
+    \tbrandnew.rb
+    \tnew.rb
+    \t../lib/new.rb
+    \tdb/migrate/
+    no changes added to commit (use "git add" and/or "git commit -a")
+    EOF
+  end
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: nit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency