abak-flow 1.0.10 → 1.1.0

data/lib/abak-flow/version.rb

@@ -1,5 +1,5 @@
 module Abak
   module Flow
-    VERSION = "1.0.10"
+    VERSION = "1.1.0"
   end
 end

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

@@ -4,31 +4,31 @@ require "spec_helper"
 describe Abak::Flow::Commands::Checkup do
   let(:command) { described_class.new }
   let(:options) { double("Options") }
+  let(:locale) { Abak::Flow::Locale.new("en") }
   let(:run) { command.run(Array.new, options) }
   let(:manager) do
     double("Manager", configuration: configuration,
-      repository: repository)
+      repository: repository, locale: locale)
   end
 
   before do
     I18n.stub(:t) { |args| args }
 
     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) }
+    let(:repository) { double("Repository", valid?: true, errors: Array.new) }
+    let(:configuration) { double("Configuration", valid?: true, errors: Array.new) }
 
     it { expect(run).to include "commands.checkup.success" }
   end
 
   context "when errors occurred" do
-    let(:repository) { double("Repository", ready?: false, errors: ["Damn"]) }
-    let(:configuration) { double("Configuration", ready?: true, errors: Array.new) }
+    let(:repository) { double("Repository", valid?: false, errors: ["Damn"]) }
+    let(:configuration) { double("Configuration", valid?: true, errors: Array.new) }
 
     it { expect { run }.to raise_error SystemExit }
   end
-end
+end

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

@@ -4,15 +4,17 @@ 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(:locale) { Abak::Flow::Locale.new("en") }
   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(:run) { command.run(Array.new, options) }
   let(:manager) do
     double("Manager", configuration: configuration,
-      repository: repository, git: git, github: github)
+      repository: repository, locale: locale,
+      git: git, github: github)
   end
 
   before do
@@ -20,21 +22,20 @@ describe Abak::Flow::Commands::Compare do
     I18n.stub(:t) { |args| args }
 
     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) }
+    let(:repository) { double("Repository", valid?: false, errors: ["Damn"]) }
+    let(:configuration) { double("Configuration", valid?: 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, upstream: upstream) }
-    let(:configuration) { double("Configuration", ready?: true, errors: Array.new) }
+    let(:repository) { double("Repository", valid?: true, errors: Array.new, origin: origin, upstream: upstream) }
+    let(:configuration) { double("Configuration", valid?: true, errors: Array.new) }
     let(:origin) { double("Origin", repo: "origin-repo/flow", to_s: "origin-repo/flow") }
     let(:upstream) { double("Upstream", owner: "User") }
 
@@ -96,4 +97,4 @@ describe Abak::Flow::Commands::Compare do
       end
     end
   end
-end
+end

metadata

@@ -1,176 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: abak-flow
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Strech (aka Sergey Fedorov)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.19.0
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: git
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: commander
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: commander
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.6
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: ruler
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 4.1.6
+- !ruby/object:Gem::Dependency
+  name: ruler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: i18n
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.9
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: ansi
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 0.6.9
+- !ruby/object:Gem::Dependency
+  name: ansi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
-  name: faraday
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.9
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.9
-  type: :runtime
-  prerelease: false
+        version: 1.4.3
 - !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'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   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'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
 description: Простой набор правил и комманд, заточеных для работы в git-flow с использование
   в качестве удаленного репозитория github
 email:
@@ -191,7 +156,13 @@ files:
 - lib/abak-flow/branch.rb
 - lib/abak-flow/commands/checkup.rb
 - lib/abak-flow/commands/compare.rb
+- lib/abak-flow/commands/configure.rb
+- lib/abak-flow/commands/done.rb
+- lib/abak-flow/commands/publish.rb
 - lib/abak-flow/configuration.rb
+- lib/abak-flow/errors_presenter.rb
+- lib/abak-flow/inspector.rb
+- lib/abak-flow/locale.rb
 - lib/abak-flow/locales/en.yml
 - lib/abak-flow/locales/ru.yml
 - lib/abak-flow/manager.rb
@@ -199,7 +170,6 @@ files:
 - lib/abak-flow/repository.rb
 - lib/abak-flow/request.rb
 - 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
@@ -207,30 +177,25 @@ files:
 homepage: https://github.com/Strech/abak-flow
 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: abak-flow
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 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
+test_files: []

data/lib/abak-flow/visitor.rb

@@ -1,63 +0,0 @@
-# coding: utf-8
-require "ansi/code"
-
-module Abak::Flow
-  class Visitor
-    def initialize(*args)
-      options = args.pop if args.last.is_a?(Hash)
-
-      @objects = args
-      @call = options.fetch(:call)
-      @inspect = options.fetch(:inspect)
-      @command = options.fetch(:command, "default")
-
-      @asked = false
-    end
-
-    def ready?
-      @asked = true
-
-      ready = @objects.map { |o| o.send(@call) }.uniq
-      ready.size == 1 && ready.first
-    end
-
-    def output
-      ready? unless asked?
-
-      @objects.map do |o|
-        next if o.send(@inspect).empty?
-
-        info = ""
-        name = o.respond_to?(:display_name) ? o.display_name : o.class.name
-        o.send(@inspect).each_with_index do |inf, idx|
-          info << "\n  #{idx + 1}. #{inf}"
-        end
-
-        "\n#{name}#{info}"
-      end * "\n"
-    end
-
-    def exit_on_fail(command, code = 1)
-      return if ready?
-
-      say ANSI.red { I18n.t("commands.#{command}.fail") }
-      say ANSI.yellow { output }
-
-      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
-    end
-  end
-end