abak-flow 1.0.8 → 1.0.9

data/lib/abak-flow/branch.rb

@@ -67,7 +67,7 @@ module Abak::Flow
       return I18n.t("commands.publish.nothing") if
         tasks_from_commit_message.empty? && !tracker_task?
 
-      [tasks_from_commit_message, task].flatten.uniq
+      [tasks_from_commit_message, task].flatten.compact.uniq
         .map { |x| "http://jira.railsc.ru/browse/#{x}" } * "\n"
     end
 

data/lib/abak-flow/commands/checkup.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require "ansi/code"
 
 module Abak::Flow
   module Commands

data/lib/abak-flow/commands/compare.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 require "commander/blank"
 require "commander/command"
+require "ansi/code"
 
 module Abak::Flow
   module Commands

data/lib/abak-flow/version.rb

@@ -1,5 +1,5 @@
 module Abak
   module Flow
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

data/lib/abak-flow/visitor.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require "ansi/code"
 
 module Abak::Flow
   class Visitor
@@ -48,7 +49,7 @@ module Abak::Flow
     def on_fail(options = Hash.new, &block)
       return if ready?
 
-      say ANSI.red I18n.t("commands.#{@command}.fail")
+      say ANSI.red { I18n.t("commands.#{@command}.fail") }
       say ANSI.yellow { output }
 
       exit(options[:exit]) if options.key?(:exit)

data/spec/lib/abak-flow/branch_spec.rb

@@ -212,12 +212,11 @@ describe Abak::Flow::Branch do
 
         before { git_feature.stub(:gcommit).and_return gcommit }
 
-        it { expect(feature.extract_body).to include "http://jira.railsc.ru/browse/JP-515" }
-        it { expect(feature.extract_body).to include "http://jira.railsc.ru/browse/PC4-200" }
+        it { expect(feature.extract_body).to eq "http://jira.railsc.ru/browse/PC4-200\nhttp://jira.railsc.ru/browse/JP-515" }
       end
 
       context "when branch is task equals to commit message" do
-        let(:gcommit) { double("Git commit", contents: "Fix JP-515") }
+        let(:gcommit) { double("Git commit", contents: "[Fix JP-515]") }
 
         before { git_feature.stub(:gcommit).and_return gcommit }
 
@@ -225,13 +224,14 @@ describe Abak::Flow::Branch do
       end
 
       context "when branch is not task" do
-        let(:gcommit) { double("Git commit", contents: "Fix PC4-200, PC5-111\n\nCloses PC2-1122") }
+        let(:gcommit) do
+          double("Git commit",
+            contents: "tree 077f77484213cd706ec6958dc7836d1c8d6aafe6\nparent 266a68fec47942a53a119c78ce74994372107d44\nauthor Strech (Sergey Fedorov) <strech_ftf@mail.ru> 1393176082 +0600\ncommitter Strech (Sergey Fedorov) <strech_ftf@mail.ru> 1393176094 +0600\n\nFIXME: Created example\n\nCloses PC4-12547")
+        end
 
         before { git_master.stub(:gcommit).and_return gcommit }
 
-        it { expect(master.extract_body).to include "http://jira.railsc.ru/browse/PC4-200" }
-        it { expect(master.extract_body).to include "http://jira.railsc.ru/browse/PC2-1122" }
-        it { expect(master.extract_body).not_to include "PC5-111" }
+        it { expect(master.extract_body).to eq "http://jira.railsc.ru/browse/PC4-12547" }
       end
     end
   end

data/spec/lib/abak-flow/commands/checkup_spec.rb

@@ -5,17 +5,13 @@ describe Abak::Flow::Commands::Checkup do
   let(:command) { described_class.new }
   let(:options) { double("Options") }
   let(:run) { command.run(Array.new, options) }
-  let(:ansi) { double("ANSI") }
   let(:manager) do
     double("Manager", configuration: configuration,
       repository: repository)
   end
 
   before do
-    stub_const('ANSI', ansi)
-    ansi.stub(green: "Success")
-    ansi.stub(red: "Fail")
-    ansi.stub(yellow: "Warning")
+    I18n.stub(:t) { |args| args }
 
     Abak::Flow::Manager.stub(instance: manager)
     Abak::Flow::Visitor.any_instance.stub(:say) { |args| args }
@@ -26,7 +22,7 @@ describe Abak::Flow::Commands::Checkup do
     let(:repository) { double("Repository", ready?: true, errors: Array.new) }
     let(:configuration) { double("Configuration", ready?: true, errors: Array.new) }
 
-    it { expect(run).to eq "Success" }
+    it { expect(run).to include "commands.checkup.success" }
   end
 
   context "when errors occurred" do

data/spec/lib/abak-flow/commands/compare_spec.rb

@@ -5,20 +5,19 @@ describe Abak::Flow::Commands::Compare do
   let(:command) { described_class.new }
   let(:options) { double("Options") }
   let(:run) { command.run(Array.new, options) }
-  let(:ansi) { double("ANSI") }
   let(:git) { double("Git") }
+  let(:github) { double("Github", web_endpoint: "github.com") }
+  let(:master) { double("Master branch", name: "master", full: "master", to_s: "master") }
+  let(:develop) { double("Develop branch", name: "develop", full: "develop", to_s: "develop") }
+  let(:noname) { double("Noname branch", name: "noname", full: "noname", to_s: "noname") }
   let(:manager) do
     double("Manager", configuration: configuration,
-      repository: repository, git: git)
+      repository: repository, git: git, github: github)
   end
 
   before do
-    stub_const('ANSI', ansi)
-    ansi.stub(green: "Success")
-    ansi.stub(red: "Fail")
-    ansi.stub(yellow: "Warning")
-
     git.stub(:branch) { |x| x }
+    I18n.stub(:t) { |args| args }
 
     Abak::Flow::Manager.stub(instance: manager)
     Abak::Flow::Visitor.any_instance.stub(:say) { |args| args }
@@ -34,14 +33,12 @@ describe Abak::Flow::Commands::Compare do
   end
 
   context "when no errors occurred" do
-    let(:repository) { double("Repository", ready?: true, errors: Array.new, origin: origin) }
+    let(:repository) { double("Repository", ready?: true, errors: Array.new, origin: origin, upstream: upstream) }
     let(:configuration) { double("Configuration", ready?: true, errors: Array.new) }
-    let(:origin) { double("Origin", repo: "origin-repo/flow") }
+    let(:origin) { double("Origin", repo: "origin-repo/flow", to_s: "origin-repo/flow") }
+    let(:upstream) { double("Upstream", owner: "User") }
 
     context "when only head/base is given" do
-      let(:current_branch) { double("Current branch", name: "cur-br-name", full: "cur-br-name") }
-      let(:master) { double("Master branch", name: "master", full: "master") }
-
       before do
         options.stub(head: master)
         options.stub(base: nil)
@@ -53,36 +50,26 @@ describe Abak::Flow::Commands::Compare do
           git.stub(current_branch: master)
           master.stub(current: true)
 
-          expect(ansi).to receive(:white)
-          expect(ansi).to receive(:green)
+          expect(git).to receive(:push).with("origin-repo/flow", master)
         end
 
-        after { run }
-
-        it { expect(git).to receive(:push).with("origin-repo/flow", master) }
+        it { expect(run).to include "github.com/origin-repo/flow/compare/User:master...master" }
       end
 
       context "when current branch is not master" do
         before do
-          Abak::Flow::Branch.any_instance.stub(extract_base_name: current_branch)
-          git.stub(current_branch: current_branch)
+          Abak::Flow::Branch.any_instance.stub(extract_base_name: noname)
+          git.stub(current_branch: noname)
           master.stub(current: false)
         end
 
         after { run }
 
-        it do
-          expect(ansi).to receive(:yellow)
-          expect(ansi).to receive(:green)
-        end
+        it { expect(run).to include "github.com/origin-repo/flow/compare/User:noname...master" }
       end
     end
 
     context "when head and base are given" do
-      let(:current_branch) { double("Current branch") }
-      let(:master) { double("Master branch", name: "master", full: "master") }
-      let(:develop) { double("Develop branch", name: "develop", full: "develop") }
-
       before do
         options.stub(head: master)
         options.stub(base: develop)
@@ -90,16 +77,11 @@ describe Abak::Flow::Commands::Compare do
 
       context "when current branch is not head" do
         before do
-          git.stub(current_branch: current_branch)
+          git.stub(current_branch: noname)
           master.stub(current: false)
         end
 
-        after { run }
-
-        it do
-          expect(ansi).to receive(:yellow)
-          expect(ansi).to receive(:green)
-        end
+        it { expect(run).to include "github.com/origin-repo/flow/compare/User:develop...master" }
       end
 
       context "when current branch is head" do
@@ -107,13 +89,10 @@ describe Abak::Flow::Commands::Compare do
           git.stub(current_branch: master)
           master.stub(current: true)
 
-          expect(ansi).to receive(:white)
-          expect(ansi).to receive(:green)
+          expect(git).to receive(:push).with("origin-repo/flow", master)
         end
 
-        after { run }
-
-        it { expect(git).to receive(:push).with("origin-repo/flow", master) }
+        it { expect(run).to include "github.com/origin-repo/flow/compare/User:develop...master" }
       end
     end
   end

metadata

@@ -2,14 +2,14 @@
 name: abak-flow
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Strech (aka Sergey Fedorov)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit