abak-flow 1.0.3 → 1.0.4

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
   - 1.9.3
-branches:
-  only:
-    - release-1.0
-bundler_args: --without linux mac
+  - 2.0.0
+  - 2.1.0
+script: bundle exec rspec

data/Rakefile

@@ -1,15 +1,12 @@
 require "bundler/gem_tasks"
-
-require "yard"
-require "yard-tomdoc"
 require "cane/rake_task"
 require "rspec/core/rake_task"
 
 desc "Ready check"
-task default: [:quality, :coverage, :doc]
+task default: [:quality, :coverage]
 
 RSpec::Core::RakeTask.new(:coverage) do |rspec|
-  ENV["COVERAGE"] = "true"
+  ENV["C"] = "true"
 end
 
 Cane::RakeTask.new(:quality) do |cane|
@@ -18,9 +15,4 @@ Cane::RakeTask.new(:quality) do |cane|
   cane.style_exclude = %w({lib}/abak-flow/request.rb)
   cane.style_measure = 120
   cane.parallel = false
-end
-
-YARD::Rake::YardocTask.new(:doc) do |yard|
-  yard.files   = %w({apps,models,lib}/**/*.rb)
-  yard.options = %w(--embed-mixins --protected --plugin tomdoc)
 end

data/abak-flow.gemspec

@@ -21,10 +21,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "octokit",   "~> 1.19.0"
-  gem.add_dependency        "faraday",    "= 0.8.9" # TODO : remove after octokit upgrade
+  gem.add_runtime_dependency "faraday",    "= 0.8.9" # TODO : remove after octokit upgrade
   gem.add_runtime_dependency "git",       "~> 1.2.5"
   gem.add_runtime_dependency "commander", ">= 4.1.3"
   gem.add_runtime_dependency "ruler",     ">= 1.4.2"
   gem.add_runtime_dependency "i18n",      ">= 0.6.1"
   gem.add_runtime_dependency "ansi",      ">= 1.4.3"
+
+  gem.add_development_dependency "cane"
+  gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "rspec", "~> 2.14"
 end

data/bin/request

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 require 'abak-flow'
+require 'abak-flow/request'

data/lib/abak-flow/branch.rb

@@ -4,7 +4,9 @@ module Abak::Flow
   class Branch
     FOLDER_HOTFIX  = "hotfix".freeze
     FOLDER_FEATURE = "feature".freeze
-    TASK_FORMAT    = /^\w+\-\d{1,}$/.freeze
+    TASK_FORMAT    = '\w+\-\d{1,}'.freeze
+    MAGICK_WORDS   = %w{close closes closed fix fixes fixed
+                        resolve resolves resolved}.freeze
 
     DEVELOPMENT = "develop".freeze
     MASTER      = "master".freeze
@@ -14,27 +16,30 @@ module Abak::Flow
       FOLDER_FEATURE => DEVELOPMENT
     }.freeze
 
-    def initialize(branch, manager)
-      @manager = manager
+    attr_reader :folder
+    attr_reader :task
+
+    def initialize(branch)
+      @manager = Manager.instance
       @branch = branch.is_a?(Git::Branch) ? branch
-                                          : manager.git.branch(branch)
+                                          : @manager.git.branch(branch)
+
+      parse_branch_name
     end
 
     def name
       @branch.full
     end
 
-    # TODO : Брать коммит мессадж до перевода строки
     def message
-      @branch.gcommit.message
-    end
+      content = @branch.gcommit.message.split("\n", 2).first
+      return content if content.length < 72
 
-    def folder
-      split_prefix_and_task.first
+      content[0...72] << "..."
     end
 
-    def task
-      split_prefix_and_task.last
+    def to_s
+      @branch.to_s
     end
 
     def compare_link(branch)
@@ -47,6 +52,25 @@ module Abak::Flow
       ]
     end
 
+    def extract_base_name(options = Hash.new)
+      mappable? ? MAPPING[folder]
+                : options.fetch(:if_undef, name)
+    end
+
+    def extract_title
+      tracker_task? ? task
+                    : message
+    end
+
+    # TODO : Сделать настраевыемым трекер и формат задачи
+    def extract_body
+      return I18n.t("commands.publish.nothing") if
+        tasks_from_commit_message.empty? && !tracker_task?
+
+      [tasks_from_commit_message, task].flatten
+        .map { |x| "http://jira.railsc.ru/browse/#{x}" } * "\n"
+    end
+
     def update
       origin = @manager.repository.origin.repo
       @manager.git.push(origin, @branch)
@@ -61,30 +85,12 @@ module Abak::Flow
       @branch.delete
     end
 
-    def pick_up_base_name(options = Hash.new)
-      mappable? ? MAPPING[folder]
-                : options.fetch(:or_use, name)
-    end
-
-    def pick_up_title
-      tracker_task? ? task
-                    : message
-    end
-
-    # TODO : Сделать настраевыемым трекер и формат задачи
-    # TODO : Смотреть в коммит мессадж и искать там Fixes/Closes/Close/Fix
-    def pick_up_body
-      head.mappable? &&
-      head.tracker_task? ? "http://jira.railsc.ru/browse/#{task}"
-                         : I18n.t("commands.publish.nothing")
-    end
-
     def develop?
-      @branch.name == DEVELOPMENT
+      name == DEVELOPMENT
     end
 
     def master?
-      @branch.name == MASTER
+      name == MASTER
     end
 
     def hotfix?
@@ -96,7 +102,7 @@ module Abak::Flow
     end
 
     def tracker_task?
-      !(task =~ TASK_FORMAT).nil?
+      !(task =~ /^#{TASK_FORMAT}$/).nil?
     end
 
     def mappable?
@@ -111,18 +117,19 @@ module Abak::Flow
       !@branch.name.empty?
     end
 
-    def to_s
-      @branch.to_s
-    end
-
     private
-    def split_prefix_and_task
-      return @folder_and_task if defined? @folder_and_task
+    def tasks_from_commit_message
+      @parsed_tasks ||=
+        @branch.gcommit.message
+               .scan(/(?:#{MAGICK_WORDS * "|"})\s+(#{TASK_FORMAT})/i)
+               .reject { |x| x == task.to_s }
+    end
 
+    def parse_branch_name
       matches = name.match(/^(?<prefix>.+)\/(?<task>.+)$/)
 
-      @folder_and_task = matches.nil? ? [nil, nil]
-                                      : [matches[:prefix], matches[:task]]
+      @folder, @task = matches.nil? ? [nil, nil]
+                                    : [matches[:prefix], matches[:task]]
     end
   end
 end

data/lib/abak-flow/manager.rb

@@ -1,16 +1,16 @@
 # coding: utf-8
 require "git"
 require "octokit"
+require "singleton"
 
 module Abak::Flow
   class Manager
+    include Singleton
 
     def initialize
       # preload dependencies
       configuration
       repository
-
-      yield self if block_given?
     end
 
     def configuration

data/lib/abak-flow/request.rb

@@ -15,7 +15,7 @@ module Abak::Flow
     c.description = "Проверить все ли настроено для работы с github и удаленными репозиториями"
 
     c.action do |args, options|
-      m = Manager.new
+      m = Manager.instance
       v = Visitor.new(m.configuration, m.repository, call: :ready?, inspect: :errors)
       v.exit_on_fail(:checkup, 1)
 
@@ -31,13 +31,13 @@ module Abak::Flow
     c.option "--head STRING", String, "Имя ветки которую нужно сравнить"
 
     c.action do |args, options|
-      m = Manager.new
+      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, m)
-      base = Branch.new(options.base || head.pick_up_base_name, m)
+      head = Branch.new(options.head || current)
+      base = Branch.new(options.base || head.extract_base_name)
 
       if head.current?
         say ANSI.white {
@@ -65,13 +65,13 @@ module Abak::Flow
     c.option "--base STRING", String, "Имя ветки, в которую нужно принять изменения"
 
     c.action do |args, options|
-      m = Manager.new
+      m = Manager.instance
 
-      head = Branch.new(m.git.current_branch, m)
-      base = Branch.new(options.base || head.pick_up_base_name, m)
+      head = Branch.new(m.git.current_branch)
+      base = Branch.new(options.base || head.extract_base_name)
 
-      title = options.title || head.pick_up_title
-      body  = options.body || head.pick_up_body
+      title = options.title || head.extract_title
+      body  = options.body || head.extract_body
 
       p = PullRequest.new({base: base, head: head, title: title, body: body}, m)
 
@@ -102,11 +102,11 @@ module Abak::Flow
     c.description = "Удалить ветки (local и origin) в которых велась работа"
 
     c.action do |args, options|
-      m = Manager.new
+      m = Manager.instance
       v = Visitor.new(m.configuration, m.repository, call: :ready?, inspect: :errors)
       v.exit_on_fail(:done, 1)
 
-      branch = Branch.new(m.git.current_branch, m)
+      branch = Branch.new(m.git.current_branch)
 
       if branch.develop? || branch.master?
         say ANSI.red {
@@ -137,7 +137,7 @@ module Abak::Flow
       #        и позволить выбирать, куда отправлять
       #        при удалении ветки, а по умолчанию использовать master
       m.git.checkout(
-        branch.pick_up_base_name(or_use: Branch::DEVELOPMENT))
+        branch.extract_base_name(if_undef: Branch::DEVELOPMENT))
       branch.delete_on_local
     end
   end # command :done

data/lib/abak-flow/version.rb

@@ -1,5 +1,5 @@
 module Abak
   module Flow
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/lib/abak-flow.rb

@@ -1,14 +1,9 @@
-module Abak
-  module Flow; end
-end
-
 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/request"       # ?
 require "abak-flow/visitor"       # ✔
 
 

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

@@ -0,0 +1,230 @@
+# coding: utf-8
+require "spec_helper"
+
+describe Abak::Flow::Branch do
+  let(:git_develop) { double("Develop", name: "develop", full: "develop") }
+  let(:git_master) { double("Master", name: "master", full: "master") }
+  let(:git_hotfix) { double("Hotfix", name: "hotfix/PR-2011", full: "hotfix/PR-2011") }
+  let(:git_feature) { double("Feature", name: "feature/JP-515", full: "feature/JP-515") }
+  let(:git_noname) { double("Noname", name: "my/own/name", full: "my/own/name") }
+
+  let(:develop) { described_class.new git_develop }
+  let(:master) { described_class.new git_master }
+  let(:hotfix) { described_class.new git_hotfix }
+  let(:feature) { described_class.new git_feature }
+  let(:noname) { described_class.new git_noname }
+
+  let(:manager) { double("Manager", git: git) }
+  let(:git) { double("Git") }
+
+  before do
+    Abak::Flow::Manager.stub(:instance).and_return manager
+
+    git.stub(:branch) { |x| x }
+  end
+
+  describe "#name" do
+    it { expect(feature.name).to eq "feature/JP-515" }
+    it { expect(develop.name).to eq "develop" }
+    it { expect(noname.name).to eq "my/own/name" }
+  end
+
+  describe "#folder" do
+    it { expect(develop.folder).to be_nil }
+    it { expect(hotfix.folder).to eq "hotfix" }
+    it { expect(feature.folder).to eq "feature" }
+    it { expect(noname.folder).to eq "my/own" }
+  end
+
+  describe "#task" do
+    it { expect(develop.task).to be_nil }
+    it { expect(feature.task).to eq "JP-515" }
+    it { expect(noname.task).to eq "name" }
+  end
+
+  describe "#hotfix?" do
+    it { expect(develop.hotfix?).to be_false }
+    it { expect(noname.hotfix?).to be_false }
+    it { expect(feature.hotfix?).to be_false }
+    it { expect(hotfix.hotfix?).to be_true }
+  end
+
+  describe "#feature?" do
+    it { expect(master.feature?).to be_false }
+    it { expect(noname.feature?).to be_false }
+    it { expect(hotfix.feature?).to be_false }
+    it { expect(feature.feature?).to be_true }
+  end
+
+  describe "#master?" do
+    it { expect(master.master?).to be_true }
+    it { expect(noname.master?).to be_false }
+    it { expect(develop.master?).to be_false }
+  end
+
+  describe "#develop?" do
+    it { expect(develop.develop?).to be_true }
+    it { expect(noname.develop?).to be_false }
+    it { expect(master.develop?).to be_false }
+  end
+
+  describe "#tracker_task?" do
+    it { expect(develop.tracker_task?).to be_false }
+    it { expect(noname.tracker_task?).to be_false }
+    it { expect(hotfix.tracker_task?).to be_true }
+    it { expect(feature.tracker_task?).to be_true }
+  end
+
+  describe "#mappable?" do
+    it { expect(develop.mappable?).to be_false }
+    it { expect(noname.mappable?).to be_false }
+    it { expect(hotfix.mappable?).to be_true }
+    it { expect(feature.mappable?).to be_true }
+  end
+
+  describe "#valid?" do
+    it { expect(develop.valid?).to be_true }
+    it { expect(noname.valid?).to be_true }
+    it do
+      branch = double("Branch", name: "", full: "")
+      expect(described_class.new(branch).valid?).to be_false
+    end
+  end
+
+  describe "#current?" do
+    before do
+      git_develop.stub(:current).and_return true
+      git_master.stub(:current).and_return false
+    end
+
+    it { expect(develop.current?).to be_true }
+    it { expect(master.current?).to be_false }
+  end
+
+  describe "#to_s" do
+    before { git_develop.stub(:to_s).and_return "Yap!" }
+    it { expect(develop.to_s).to eq "Yap!" }
+  end
+
+  describe "#message" do
+    before { git_noname.stub(:gcommit).and_return gcommit }
+
+    context "when git commit is a short single line" do
+      let(:gcommit) { double("Git commit", message: "Hello commit message") }
+
+      it { expect(noname.message).to eq "Hello commit message" }
+    end
+
+    context "when git commit is a very long single line" do
+      let(:gcommit) { double("Git commit", message: "X" * 200) }
+
+      it { expect(noname.message.length).to eq 75 }
+      it { expect(noname.message).to include "..." }
+    end
+
+    context "when git commit is a short multi line" do
+      let(:message) { "Hello commit message\n\nFixes PC4-100" }
+      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(:gcommit) { double("Git commit", message: message) }
+
+      it { expect(noname.message.length).to eq 75 }
+      it { expect(noname.message).to include "..." }
+    end
+  end
+
+  describe "#extract_title" do
+    let(:message) { "Hello world!\n\nFixes PC4-100" }
+    let(:gcommit) { double("Git commit", message: message) }
+
+    context "when branch named not like tracker task" do
+      before { git_noname.stub(:gcommit).and_return gcommit }
+
+      it { expect(noname.extract_title).to eq "Hello world!" }
+    end
+
+    context "when branch named not like tracker task" do
+      before { git_feature.stub(:gcommit).and_return gcommit }
+
+      it { expect(feature.extract_title).to eq "JP-515" }
+    end
+  end
+
+  describe "#extract_base_name" do
+    context "when no options are given" do
+      it { expect(master.extract_base_name).to eq "master" }
+      it { expect(develop.extract_base_name).to eq "develop" }
+      it { expect(hotfix.extract_base_name).to eq "master" }
+      it { expect(feature.extract_base_name).to eq "develop" }
+      it { expect(noname.extract_base_name).to eq "my/own/name" }
+    end
+
+    context "when if_undef option is given" do
+      it { expect(hotfix.extract_base_name(if_undef: "foo")).to eq "master" }
+      it { expect(master.extract_base_name(if_undef: "foo")).to eq "foo" }
+      it { expect(noname.extract_base_name(if_undef: "foo")).to eq "foo" }
+    end
+  end
+
+  describe "#extract_body" 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") }
+
+      before do
+        git_feature.stub(:gcommit).and_return gcommit
+        git_hotfix.stub(:gcommit).and_return gcommit
+        git_master.stub(:gcommit).and_return gcommit
+        git_develop.stub(:gcommit).and_return gcommit
+        git_noname.stub(:gcommit).and_return gcommit
+      end
+
+      it { expect(feature.extract_body).to eq "http://jira.railsc.ru/browse/JP-515" }
+      it { expect(hotfix.extract_body).to eq "http://jira.railsc.ru/browse/PR-2011" }
+      it { expect(master.extract_body).to eq "Empty!" }
+      it { expect(develop.extract_body).to eq "Empty!" }
+      it { expect(noname.extract_body).to eq "Empty!" }
+
+      it  do
+        branch = double("Branch", name: "feature/ho-ho-ho", full: "feature/ho-ho-ho")
+        branch.stub(:gcommit).and_return gcommit
+
+        expect(described_class.new(branch).extract_body).to eq "Empty!"
+      end
+
+      it do
+        branch = double("Branch", name: "ho-ho-ho/PC4-10202", full: "ho-ho-ho/PC4-10202")
+        branch.stub(:gcommit).and_return gcommit
+
+        expect(described_class.new(branch).extract_body).to eq "http://jira.railsc.ru/browse/PC4-10202"
+      end
+    end
+
+    context "when commit message has magick word" do
+      context "when branch is task" do
+        let(:gcommit) { double("Git commit", message: "Fix PC4-200") }
+
+        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" }
+      end
+
+      context "when branch is not task" do
+        let(:gcommit) { double("Git commit", message: "Fix PC4-200, PC5-111\n\nCloses PC2-1122") }
+
+        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" }
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,17 +1,16 @@
 # coding: utf-8
-if ENV["COVERAGE"]
+if ENV["C"]
   require "simplecov"
 
-  SimpleCov.minimum_coverage 95
-  SimpleCov.start :test_frameworks do
+  SimpleCov.start do
     add_filter "/spec/"
   end
 end
 
 require "abak-flow"
 
-Dir["spec/support/**/*.rb"].sort.each { |f| require f }
-
 RSpec.configure do |config|
-  # ...
+  config.formatter = :progress
+  config.order = :random
+  config.color = true
 end

metadata

@@ -2,14 +2,14 @@
 name: abak-flow
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Strech (aka Sergey Fedorov)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -123,6 +123,54 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: cane
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
 description: Простой набор правил и комманд, заточеных для работы в git-flow с использование
   в качестве удаленного репозитория github
 email:
@@ -150,15 +198,7 @@ files:
 - lib/abak-flow/request.rb
 - lib/abak-flow/version.rb
 - lib/abak-flow/visitor.rb
-- spec/abak-flow/branch_spec.rb
-- spec/abak-flow/branches_spec.rb
-- spec/abak-flow/configuration_spec.rb
-- spec/abak-flow/git_spec.rb
-- spec/abak-flow/github_client_spec.rb
-- spec/abak-flow/messages_spec.rb
-- spec/abak-flow/project_spec.rb
-- spec/abak-flow/pull_request_spec.rb
-- spec/abak-flow/system_spec.rb
+- spec/lib/abak-flow/branch_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/Strech/abak-flow
 licenses:
@@ -186,13 +226,5 @@ signing_key:
 specification_version: 3
 summary: Совмещение 2-х подходов разработки Git-flow & Github-flow
 test_files:
-- spec/abak-flow/branch_spec.rb
-- spec/abak-flow/branches_spec.rb
-- spec/abak-flow/configuration_spec.rb
-- spec/abak-flow/git_spec.rb
-- spec/abak-flow/github_client_spec.rb
-- spec/abak-flow/messages_spec.rb
-- spec/abak-flow/project_spec.rb
-- spec/abak-flow/pull_request_spec.rb
-- spec/abak-flow/system_spec.rb
+- spec/lib/abak-flow/branch_spec.rb
 - spec/spec_helper.rb