abak-flow 1.0.6 → 1.0.7

data/lib/abak-flow/branch.rb

@@ -120,7 +120,7 @@ module Abak::Flow
     private
     def tasks_from_commit_message
       @parsed_tasks ||=
-        @branch.gcommit.message
+        @branch.gcommit.contents
                .scan(/(?:#{MAGICK_WORDS * "|"})\s+(#{TASK_FORMAT})/i)
     end
 

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

@@ -0,0 +1,24 @@
+# coding: utf-8
+
+module Abak::Flow
+  module Commands
+    class Checkup
+
+      def initialize
+        manager = Manager.instance
+
+        @configuration = manager.configuration
+        @repository = manager.repository
+      end
+
+      def run(args, options)
+        Visitor.new(@configuration, @repository,
+                    command: "checkup", call: :ready?, inspect: :errors)
+               .on_fail(exit: 1)
+
+        say ANSI.green { I18n.t("commands.checkup.success") }
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# coding: utf-8
+require "commander/blank"
+require "commander/command"
+
+module Abak::Flow
+  module Commands
+    class Compare
+      def initialize
+        manager = Manager.instance
+
+        @configuration = manager.configuration
+        @repository = manager.repository
+        @git = manager.git
+      end
+
+      def run(args, options)
+        Checkup.new.run(Array.new, ::Commander::Command::Options.new)
+
+        current = @git.current_branch
+        head = Branch.new(options.head || current)
+        base = Branch.new(options.base || head.extract_base_name)
+
+        if head.current?
+          say ANSI.white {
+            I18n.t("commands.compare.updating",
+              branch: ANSI.bold { head },
+              upstream: ANSI.bold { "#{@repository.origin}" }) }
+
+          head.update
+        else
+          say ANSI.yellow {
+            I18n.t("commands.compare.diverging",
+              branch: ANSI.bold { head }) }
+        end
+
+        say ANSI.green { head.compare_link(base) }
+      end
+
+    end
+  end
+end

data/lib/abak-flow/locales/en.yml

@@ -22,6 +22,8 @@ en:
       body_is_incorrect: Message body is not specified
 
   commands:
+    default:
+      fail: Something goes wrong!
     checkup:
       fail: You are not prepared!
       success: "Congratulations, you are ready to ROCK :)"

data/lib/abak-flow/locales/ru.yml

@@ -22,6 +22,8 @@ ru:
       body_is_incorrect: Не указано содержание
 
   commands:
+    default:
+      fail: Что-то пошло не так!
     checkup:
       fail: "Вы не готовы!"
       success: "Поздравляем, вы готовы чтобы жечь :)"

data/lib/abak-flow/request.rb

@@ -9,18 +9,10 @@ module Abak::Flow
 
   default_command :help
 
-  # TODO : Заменить команды классами
-  command :checkup do |c|
-    c.syntax      = "git request checkup"
-    c.description = "Проверить все ли настроено для работы с github и удаленными репозиториями"
-
-    c.action do |args, options|
-      m = Manager.instance
-      v = Visitor.new(m.configuration, m.repository, call: :ready?, inspect: :errors)
-      v.exit_on_fail(:checkup, 1)
-
-      say ANSI.green { I18n.t("commands.checkup.success") }
-    end
+  command :checkup do |cmd|
+    cmd.syntax      = "git request checkup"
+    cmd.description = "Проверить все ли настроено для работы с github и удаленными репозиториями"
+    cmd.action Commands::Checkup, :run
   end # command :checkup
 
   command :compare do |c|
@@ -30,30 +22,7 @@ module Abak::Flow
     c.option "--base STRING", String, "Имя ветки с которой нужно сравнить"
     c.option "--head STRING", String, "Имя ветки которую нужно сравнить"
 
-    c.action do |args, options|
-      m = Manager.instance
-      v = Visitor.new(m.configuration, m.repository, call: :ready?, inspect: :errors)
-      v.exit_on_fail(:compare, 1)
-
-      current = m.git.current_branch
-      head = Branch.new(options.head || current)
-      base = Branch.new(options.base || head.extract_base_name)
-
-      if head.current?
-        say ANSI.white {
-          I18n.t("commands.compare.updating",
-            branch: ANSI.bold { head },
-            upstream: ANSI.bold { "#{m.repository.origin}" }) }
-
-        head.update
-      else
-        say ANSI.yellow {
-          I18n.t("commands.compare.diverging",
-            branch: ANSI.bold { head }) }
-      end
-
-      say ANSI.green { head.compare_link(base) }
-    end
+    cmd.action Commands::Compare, :run
   end # command :compare
 
   command :publish do |c|

data/lib/abak-flow/version.rb

@@ -1,5 +1,5 @@
 module Abak
   module Flow
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

data/lib/abak-flow/visitor.rb

@@ -8,6 +8,7 @@ module Abak::Flow
       @objects = args
       @call = options.fetch(:call)
       @inspect = options.fetch(:inspect)
+      @command = options.fetch(:command, "default")
 
       @asked = false
     end
@@ -44,6 +45,15 @@ module Abak::Flow
       exit(code)
     end
 
+    def on_fail(options = Hash.new, &block)
+      return if ready?
+
+      say ANSI.red I18n.t("commands.#{@command}.fail")
+      say ANSI.yellow { output }
+
+      exit(options[:exit]) if options.key?(:exit)
+    end
+
     private
     def asked?
       @asked

data/lib/abak-flow.rb

@@ -1,10 +1,12 @@
-require "abak-flow/version"       # ✔
-require "abak-flow/manager"       # ✔
-require "abak-flow/configuration" # ✔
-require "abak-flow/repository"    # ✔
-require "abak-flow/branch"        # ?
-require "abak-flow/pull_request"  # ?
-require "abak-flow/visitor"       # ✔
+require "abak-flow/version"
+require "abak-flow/manager"
+require "abak-flow/configuration"
+require "abak-flow/repository"
+require "abak-flow/branch"
+require "abak-flow/pull_request"
+require "abak-flow/visitor"
+require "abak-flow/commands/checkup"
+require "abak-flow/commands/compare"
 
 
 # Может пригодится

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

@@ -123,14 +123,14 @@ describe Abak::Flow::Branch do
     end
 
     context "when git commit is a short multi line" do
-      let(:message) { "Hello commit message\n\nFixes PC4-100" }
+      let(:message) { "Hello commit message\n\nAnother new line" }
       let(:gcommit) { double("Git commit", message: message) }
 
       it { expect(noname.message).to eq "Hello commit message" }
     end
 
     context "when git commit is a very long multi line" do
-      let(:message) { "#{'X' * 200}\n\nFixes PC4-100" }
+      let(:message) { "#{'X' * 200}\n\nAnother new line" }
       let(:gcommit) { double("Git commit", message: message) }
 
       it { expect(noname.message.length).to eq 75 }
@@ -139,7 +139,7 @@ describe Abak::Flow::Branch do
   end
 
   describe "#extract_title" do
-    let(:message) { "Hello world!\n\nFixes PC4-100" }
+    let(:message) { "Hello world!\n\nAnother new line" }
     let(:gcommit) { double("Git commit", message: message) }
 
     context "when branch named not like tracker task" do
@@ -175,7 +175,7 @@ describe Abak::Flow::Branch do
     before { I18n.stub(:t).with("commands.publish.nothing").and_return "Empty!" }
 
     context "when commit message has no magick words" do
-      let(:gcommit) { double("Git commit", message: "Hello world") }
+      let(:gcommit) { double("Git commit", contents: "Hello world") }
 
       before do
         git_feature.stub(:gcommit).and_return gcommit
@@ -208,7 +208,7 @@ describe Abak::Flow::Branch do
 
     context "when commit message has magick word" do
       context "when branch is task different from commit message" do
-        let(:gcommit) { double("Git commit", message: "Fix PC4-200") }
+        let(:gcommit) { double("Git commit", contents: "Fix PC4-200") }
 
         before { git_feature.stub(:gcommit).and_return gcommit }
 
@@ -217,7 +217,7 @@ describe Abak::Flow::Branch do
       end
 
       context "when branch is task equals to commit message" do
-        let(:gcommit) { double("Git commit", message: "Fix JP-515") }
+        let(:gcommit) { double("Git commit", contents: "Fix JP-515") }
 
         before { git_feature.stub(:gcommit).and_return gcommit }
 
@@ -225,7 +225,7 @@ describe Abak::Flow::Branch do
       end
 
       context "when branch is not task" do
-        let(:gcommit) { double("Git commit", message: "Fix PC4-200, PC5-111\n\nCloses PC2-1122") }
+        let(:gcommit) { double("Git commit", contents: "Fix PC4-200, PC5-111\n\nCloses PC2-1122") }
 
         before { git_master.stub(:gcommit).and_return gcommit }
 

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

@@ -0,0 +1,38 @@
+# coding: utf-8
+require "spec_helper"
+
+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")
+
+    Abak::Flow::Manager.stub(instance: manager)
+    Abak::Flow::Visitor.any_instance.stub(:say) { |args| args }
+    Abak::Flow::Commands::Checkup.any_instance.stub(:say) { |args| args }
+  end
+
+  context "when no errors occurred" 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" }
+  end
+
+  context "when errors occurred" do
+    let(:repository) { double("Repository", ready?: false, errors: ["Damn"]) }
+    let(:configuration) { double("Configuration", ready?: true, errors: Array.new) }
+
+    it { expect { run }.to raise_error SystemExit }
+  end
+end

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

@@ -0,0 +1,120 @@
+# coding: utf-8
+require "spec_helper"
+
+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(:manager) do
+    double("Manager", configuration: configuration,
+      repository: repository, git: git)
+  end
+
+  before do
+    stub_const('ANSI', ansi)
+    ansi.stub(green: "Success")
+    ansi.stub(red: "Fail")
+    ansi.stub(yellow: "Warning")
+
+    git.stub(:branch) { |x| x }
+
+    Abak::Flow::Manager.stub(instance: manager)
+    Abak::Flow::Visitor.any_instance.stub(:say) { |args| args }
+    Abak::Flow::Commands::Compare.any_instance.stub(:say) { |args| args }
+    Abak::Flow::Commands::Checkup.any_instance.stub(:say) { |args| args }
+  end
+
+  context "when errors occurred" do
+    let(:repository) { double("Repository", ready?: false, errors: ["Damn"]) }
+    let(:configuration) { double("Configuration", ready?: true, errors: Array.new) }
+
+    it { expect { run }.to raise_error SystemExit }
+  end
+
+  context "when no errors occurred" do
+    let(:repository) { double("Repository", ready?: true, errors: Array.new, origin: origin) }
+    let(:configuration) { double("Configuration", ready?: true, errors: Array.new) }
+    let(:origin) { double("Origin", repo: "origin-repo/flow") }
+
+    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)
+      end
+
+      context "when current branch is master" do
+        before do
+          Abak::Flow::Branch.any_instance.stub(extract_base_name: master)
+          git.stub(current_branch: master)
+          master.stub(current: true)
+
+          expect(ansi).to receive(:white)
+          expect(ansi).to receive(:green)
+        end
+
+        after { run }
+
+        it { expect(git).to receive(:push).with("origin-repo/flow", 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)
+          master.stub(current: false)
+        end
+
+        after { run }
+
+        it do
+          expect(ansi).to receive(:yellow)
+          expect(ansi).to receive(:green)
+        end
+      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)
+      end
+
+      context "when current branch is not head" do
+        before do
+          git.stub(current_branch: current_branch)
+          master.stub(current: false)
+        end
+
+        after { run }
+
+        it do
+          expect(ansi).to receive(:yellow)
+          expect(ansi).to receive(:green)
+        end
+      end
+
+      context "when current branch is head" do
+        before do
+          git.stub(current_branch: master)
+          master.stub(current: true)
+
+          expect(ansi).to receive(:white)
+          expect(ansi).to receive(:green)
+        end
+
+        after { run }
+
+        it { expect(git).to receive(:push).with("origin-repo/flow", master) }
+      end
+    end
+  end
+end

metadata

@@ -2,14 +2,14 @@
 name: abak-flow
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Strech (aka Sergey Fedorov)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -205,6 +205,8 @@ files:
 - bin/request
 - lib/abak-flow.rb
 - lib/abak-flow/branch.rb
+- lib/abak-flow/commands/checkup.rb
+- lib/abak-flow/commands/compare.rb
 - lib/abak-flow/configuration.rb
 - lib/abak-flow/locales/en.yml
 - lib/abak-flow/locales/ru.yml
@@ -215,6 +217,8 @@ files:
 - lib/abak-flow/version.rb
 - lib/abak-flow/visitor.rb
 - spec/lib/abak-flow/branch_spec.rb
+- spec/lib/abak-flow/commands/checkup_spec.rb
+- spec/lib/abak-flow/commands/compare_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/Strech/abak-flow
 licenses:
@@ -243,4 +247,6 @@ specification_version: 3
 summary: Совмещение 2-х подходов разработки Git-flow & Github-flow
 test_files:
 - spec/lib/abak-flow/branch_spec.rb
+- spec/lib/abak-flow/commands/checkup_spec.rb
+- spec/lib/abak-flow/commands/compare_spec.rb
 - spec/spec_helper.rb