nit 0.0.1 → 0.0.2

data/test/dummies/stage/on_stage.rb

@@ -0,0 +1 @@
+bu

data/test/dummies/stage/staged.rb

@@ -0,0 +1 @@
+yo!

data/test/files_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class NitFileTest < MiniTest::Spec
+  it { Nit::File.new("new.rb", "<line 1>").to_s.must_equal "new.rb" }
+end
+
+class FilesTest < MiniTest::Spec
+  subject { Nit::Files.new(["on_stage.rb", "stage.rb", "stagedive.mk"]) }
+
+  describe "#[]" do
+    it { subject[100].must_equal nil }
+    it { subject[0].to_s.must_equal "on_stage.rb" }
+    it { subject["0"].to_s.must_equal "on_stage.rb" }
+  end
+
+  describe "#index" do
+    it { subject.index("on_stage.rb").must_equal 0 }
+    #it { subject.index(Nit::File.new("on_stage.rb", "<line 1>")).must_equal 0 }
+  end
+
+  # methods that should be in a separate class, like CliIndexer or so.
+  describe "#evaluate" do
+    it { subject.evaluate([1,2]).must_equal ["stage.rb", "stagedive.mk"] }
+  end
+
+  describe "#list" do
+    it { subject.list([0, 1]).must_equal "on_stage.rb stage.rb" }
+  end
+end
+
+class CharIndexerTest < MiniTest::Spec
+  subject { Nit::Files.new(["on_stage.rb", "stage.rb", "stagedive.mk"], Nit::Files::CharIndexer) }
+
+  describe "#evaluate" do
+    it { subject.evaluate(["b","c"]).must_equal ["stage.rb", "stagedive.mk"] }
+    it { subject.evaluate(["bc"]).must_equal ["stage.rb", "stagedive.mk"] }
+
+    it { subject.index("stage.rb").must_equal "b" }
+  end
+
+  describe "#list" do
+    it { subject.list(["b","c"]).must_equal "stage.rb stagedive.mk" }
+    it { subject.list(["bc"]).must_equal "stage.rb stagedive.mk" }
+  end
+end

data/test/ignore_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class IgnoreTest < StatusTest
+  let (:config) { cfg = Nit::Config.new; cfg.indexer = "IntegerIndexer"; cfg }
+
+  after do
+    config.send(:file).rm!
+  end
+
+  it "ignores invalid indexes" do
+    Nit::Ignore.new(config).call(output, [100])
+    config.ignored_files.must_equal []
+  end
+
+  it "what" do
+    config.ignored_files.must_equal []
+
+    Nit::Ignore.new(config).call(output, [0,1])
+
+    config.ignored_files.must_equal ["on_stage.rb", "staged.rb"]
+  end
+
+  describe "ignore (no arguments)" do
+    it "blanks when nothing ignored" do
+      Nit::Ignore.new(config).call(output, []).must_equal nil
+    end
+
+    it "shows ignored files" do
+      Nit::Ignore.new(config).call(output, [1])
+
+      Nit::Ignore.new(config).call(output, []).must_equal <<-EOF
+Ignored files:
+[0] staged.rb
+EOF
+# FIXME: why is <<- not working?
+    end
+  end
+
+  describe "unignore 1 2" do
+    it "what" do
+      Nit::Ignore.new(config).call(output, [0,1])
+      Nit::Unignore.new(config).call(output, [1])
+      config.ignored_files.must_equal ["on_stage.rb"]
+    end
+  end
+end

data/test/lines_test.rb

@@ -0,0 +1,26 @@
+class LinesTest < StatusTest
+  describe "#files" do
+    it do
+      Nit::Lines.new(output).files.map(&:to_s).must_equal([
+        "on_stage.rb",
+        "staged.rb",
+        "brandnew.rb",
+        "new.rb",
+        "../lib/new.rb"])
+    end
+  end
+
+  describe "#to_s" do
+    let (:output) { "1\n2" }
+    it { Nit::Lines.new(output).to_s.must_equal(output) }
+  end
+
+  describe "Line" do
+    let (:lines) { Nit::Lines.new("stage\nrocks") }
+    subject { lines[0] }
+
+    it { subject.to_s.must_equal "stage" }
+    it { subject.delete
+         lines.to_s.must_equal "rocks"}
+  end
+end

data/test/nit_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+# this is like an integration test just checking if the "click paths" work.
+class NitTest < MiniTest::Spec
+  let (:on_stage_line) { "modified:   on_stage.rb  [a]" }
+
+  describe "nit status" do
+    it "numbers files to stage" do # TODO: 2BRM, moved to status_test.
+      #nit("status").must_match /modified\:\s+on_stage\.rb\s+[a]/
+      nit("status").must_match on_stage_line
+    end
+  end
+
+  describe "nit" do
+    it "delegates to status" do
+      nit("").must_match on_stage_line
+    end
+  end
+
+  def nit(args)
+    output = ""
+    Dir.chdir "test/dummies/stage" do
+      `cp -R git .git`
+      output = `../../../bin/nit #{args}`
+      `rm -rf .git`
+    end
+    output
+  end
+end
+
+class DynamicCommandTest < NitTest
+  it "evaluates indexes and invokes git command with it" do
+    # how to capture STDERR: https://www.ruby-forum.com/topic/1103519#982117
+    nit(" checkout e 2>&1").must_match "error: pathspec 'new.rb' did not match any file(s) known to git."
+  end
+end
+
+class DiffTest < NitTest
+  it { nit(" diff b").must_match "a\/staged.rb" }
+end
+
+class NitWithCharIndexerTest < NitTest
+  it do
+    out = nit(" diff ab")
+    out.must_match "a\/staged.rb"
+    out.must_match "a\/on_stage.rb"
+  end
+end

data/test/status_test.rb

@@ -0,0 +1,88 @@
+require 'test_helper'
+
+class StatusTest < MiniTest::Spec
+  let (:config) do
+    Nit::Config.new.tap do |cfg| # TODO: test with all combinations?
+      cfg.indexer         = "IntegerIndexer"
+      cfg.index_renderer  = "PrependIndexRenderer"
+    end
+  end
+
+  let (: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
+    no changes added to commit (use "git add" and/or "git commit -a")
+    EOF
+  end
+  subject { Nit::Status.new(config) }
+
+
+  describe "indexing" do
+    it "numbers files" 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"
+    end
+  end
+
+  describe "char indexing" do
+    it "indexes files" do
+      config.indexer = "CharIndexer"
+
+      console = subject.call(output)
+      console.must_match "modified: [a]    on_stage.rb"
+      console.must_match "modified: [b]    staged.rb"
+      console.must_match "[c] brandnew.rb"
+      console.must_match "[d] new.rb"
+    end
+  end
+
+  describe "ignoring" do
+    after do
+      config.send(:file).rm!
+    end
+
+    it "doesn't show ignored files count per default" do
+      subject.call(output).wont_match(/Ignored files:/)
+    end
+
+    it "shows ignored files when ignoring" do
+      config.ignored_files = ["new.rb", "brandnew.rb", "staged.rb"] # TODO: make this more generic.
+
+      console = subject.call(output)
+      console.must_match "[1] ../lib/new.rb" # this file has a new index since all other ignored.
+      console.must_match "Ignored files: 3"
+      console.wont_match " staged.rb"
+      console.wont_match " new.rb"
+      console.wont_match " brandnew.rb"
+      console.must_match " ../lib/new.rb"
+    end
+
+    it "also ignores files when commiting" do
+      config.ignored_files = ["new.rb", "brandnew.rb", "staged.rb"] # TODO: make this more generic.
+
+      commit = Nit::Commit.new(config)
+      commit.instance_eval do
+        def system(command)
+          command
+        end
+      end
+
+      commit.call(output, [1]).must_equal "git add ../lib/new.rb && git commit"
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'minitest/autorun'
+require 'nit/app'

metadata

@@ -1,20 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: nit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +41,36 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Nit improves your git workflows.
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+description: Improving your Git workflow since 2013.
 email:
 - apotonick@gmail.com
-executables: []
+executables:
+- nit
 extensions: []
 extra_rdoc_files: []
 files:
@@ -55,32 +79,111 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Thorfile
+- bin/nit
 - lib/nit.rb
+- lib/nit/CHANGES.mk
+- lib/nit/app.rb
+- lib/nit/commit.rb
+- lib/nit/config.rb
+- lib/nit/files.rb
+- lib/nit/ignore.rb
+- lib/nit/lines.rb
+- lib/nit/status.rb
 - lib/nit/version.rb
 - nit.gemspec
-homepage: ''
+- test/config_test.rb
+- test/dummies/stage/.gitignore
+- test/dummies/stage/brandnew.rb
+- test/dummies/stage/git/COMMIT_EDITMSG
+- test/dummies/stage/git/HEAD
+- test/dummies/stage/git/config
+- test/dummies/stage/git/description
+- test/dummies/stage/git/hooks/applypatch-msg.sample
+- test/dummies/stage/git/hooks/commit-msg.sample
+- test/dummies/stage/git/hooks/post-update.sample
+- test/dummies/stage/git/hooks/pre-applypatch.sample
+- test/dummies/stage/git/hooks/pre-commit.sample
+- test/dummies/stage/git/hooks/pre-rebase.sample
+- test/dummies/stage/git/hooks/prepare-commit-msg.sample
+- test/dummies/stage/git/hooks/update.sample
+- test/dummies/stage/git/index
+- test/dummies/stage/git/info/exclude
+- test/dummies/stage/git/logs/HEAD
+- test/dummies/stage/git/logs/refs/heads/master
+- test/dummies/stage/git/objects/0f/e4f83176db6842cd95f439f1edad3cb8483b4e
+- test/dummies/stage/git/objects/5c/0d92dd14afeb4c2bcd11bc3f072390be598a73
+- test/dummies/stage/git/objects/60/bd895ee4a908b754f1980491c0e0852c29a8cd
+- test/dummies/stage/git/objects/b7/5ac79d08245a3a8a662520dd90f80be097cc44
+- test/dummies/stage/git/objects/c1/172bf75d73a630c467f1e1448c44d9188fe23e
+- test/dummies/stage/git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+- test/dummies/stage/git/refs/heads/master
+- test/dummies/stage/new.rb
+- test/dummies/stage/on_stage.rb
+- test/dummies/stage/staged.rb
+- test/files_test.rb
+- test/ignore_test.rb
+- test/lines_test.rb
+- test/nit_test.rb
+- test/status_test.rb
+- test/test_helper.rb
+homepage: http://github.com/apotonick/nit
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Nit improves your git workflows.
-test_files: []
+test_files:
+- test/config_test.rb
+- test/dummies/stage/.gitignore
+- test/dummies/stage/brandnew.rb
+- test/dummies/stage/git/COMMIT_EDITMSG
+- test/dummies/stage/git/HEAD
+- test/dummies/stage/git/config
+- test/dummies/stage/git/description
+- test/dummies/stage/git/hooks/applypatch-msg.sample
+- test/dummies/stage/git/hooks/commit-msg.sample
+- test/dummies/stage/git/hooks/post-update.sample
+- test/dummies/stage/git/hooks/pre-applypatch.sample
+- test/dummies/stage/git/hooks/pre-commit.sample
+- test/dummies/stage/git/hooks/pre-rebase.sample
+- test/dummies/stage/git/hooks/prepare-commit-msg.sample
+- test/dummies/stage/git/hooks/update.sample
+- test/dummies/stage/git/index
+- test/dummies/stage/git/info/exclude
+- test/dummies/stage/git/logs/HEAD
+- test/dummies/stage/git/logs/refs/heads/master
+- test/dummies/stage/git/objects/0f/e4f83176db6842cd95f439f1edad3cb8483b4e
+- test/dummies/stage/git/objects/5c/0d92dd14afeb4c2bcd11bc3f072390be598a73
+- test/dummies/stage/git/objects/60/bd895ee4a908b754f1980491c0e0852c29a8cd
+- test/dummies/stage/git/objects/b7/5ac79d08245a3a8a662520dd90f80be097cc44
+- test/dummies/stage/git/objects/c1/172bf75d73a630c467f1e1448c44d9188fe23e
+- test/dummies/stage/git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+- test/dummies/stage/git/refs/heads/master
+- test/dummies/stage/new.rb
+- test/dummies/stage/on_stage.rb
+- test/dummies/stage/staged.rb
+- test/files_test.rb
+- test/ignore_test.rb
+- test/lines_test.rb
+- test/nit_test.rb
+- test/status_test.rb
+- test/test_helper.rb