abak-flow 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGU3ZjFmYjE3OWMyMDM4NTI1NWJjYzQxZDFjZTM5YmQ2YmQ0M2Q1ZQ==
+    MDFkNDI2YTZiMTk4Y2Q4YTQxNzlmMzc3MGMzOGNmOTk5ODg3ZWM3Nw==
   data.tar.gz: !binary |-
-    NjViMDJhOWE1ZmRhMTU0ZjZkNjVkNjhlYTBiZmE0ZTM1NjgyYzlkZA==
+    YjMxMzFkNjQ1MWNlMTZkZjMxMmY5ZDZkMGYwYzk2NmYyNzZjNTQ2Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWE0M2ZjYmJkMDQ0MWU4OWUxZDBiODk4NTU0N2Q2M2IyZTU4ZGIyZTgxZTBl
-    NGEyY2M4YTZjMjI4ZmZjY2FlZjJjMTZiMzg0YThmYTBkN2E1ODA2NzVjYjc2
-    MjFiZDlkZDdiMmU1ODExNzJiNzBhYzA0MDE1ZWNjMTIxMjViOWI=
+    ZWI2OTM3ZTlmY2I4NWE0NTUxMDYzODY2OTBjMDZmZDQ4Yzk5NjFjZmM4Y2U3
+    YmM0NjE2MDFkM2M2NjRjNzE5MTg3MmU1ODJiZjI4OGE3ZDAzNjAxMzNhYzMx
+    NWRhYmU0YmVhZTRmMTY0YmZiNDRiOTQyYjY3YTk1OGY0Y2EzZDA=
   data.tar.gz: !binary |-
-    MzZkYmQ0OThkMDcxYjFlNmI4MTdlYmRjOTY1NzBmNDYxNTI3Mjc5M2M5ZjVh
-    YmM2ZDJlM2ZhOTk0YjQ5MWJkZmVkNmVkY2I2MmMwOTYxMTQyOWZhOTBiMGEw
-    YzVmYjYzNjY4ZDZiOGZmYjEyMzFkOTM4MGFhYjI1YjgwZTQ1ZGU=
+    ODEwY2Y3YWQyNzc5NzYzMmJjMzE4MDI5MTYxNjJhMDY3MTM5NGIyM2E4NmMz
+    MmZiMzhkYTdlOWQwN2QxOGIyN2MwNDMyNWJmN2NjZWJhNDRjNzE5NWExNzUx
+    NWEzZTdiMGNkMzI3ZDc4Yjg0ZDhhNTUyOGNkMTdkMjdiODBiNTc=

data/README.md

@@ -34,7 +34,7 @@ Github-flow же наоборот ведет основную разработк
     $ git remote add upstream git://github.com/GITHUB_PROJECT_USER/GITHUB_PROJECT_NAME.git
     
 ### А если я использую прокси, как быть?
-    $ git config --global abak.proxy http://my-proxy.com:3129
+    $ git config --global abak-flow.http-proxy http://my-proxy.com:3129
     
 Далее по приоритету идут переменные окружения. Сначала **http_proxy**, затем **HTTP_PROXY**
 
@@ -92,7 +92,7 @@ Github-flow же наоборот ведет основную разработк
 ## А помощь?
 Многие команды имеют какие-то дополнительные опции. Но они нужны только в экзотических случаях. Но при любом раскладе подсказку и тонкий намек всегда можно получить воспользовавших такой командой:
 
-    $ git request done --help
+    $ git request publish --help
 
 # В заключении
 Данный репозиторий и изложенные в нем идеи ни в коем случае не претендуют на идеал и совершенство. Это всего лишь узко заточенная комбинация гемов

data/lib/abak-flow/request.rb

@@ -110,9 +110,7 @@ module Abak::Flow
 
       v = Visitor.new(p, call: :publish, look_for: :errors)
       if v.ready?
-        say ANSI.green {
-          I18n.t("commands.publish.success",
-            link: ANSI.bold { p.link }) }
+        say ANSI.green { I18n.t("commands.publish.success", link: p.link) }
       else
         say ANSI.red { I18n.t("commands.publish.fail") }
         say ANSI.yellow { v.output }

data/lib/abak-flow/version.rb

@@ -1,5 +1,5 @@
 module Abak
   module Flow
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abak-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Strech (aka Sergey Fedorov)
@@ -113,12 +113,10 @@ files:
 - bin/request
 - lib/abak-flow.rb
 - lib/abak-flow/branch.rb
-- lib/abak-flow/branches.rb
 - lib/abak-flow/configuration.rb
 - lib/abak-flow/locales/en.yml
 - lib/abak-flow/locales/ru.yml
 - lib/abak-flow/manager.rb
-- lib/abak-flow/messages.rb
 - lib/abak-flow/pull_request.rb
 - lib/abak-flow/repository.rb
 - lib/abak-flow/request.rb

data/lib/abak-flow/branches.rb

@@ -1,68 +0,0 @@
-# coding: utf-8
-#
-# Wrapper class for git branches.
-# Provides access to git branches and also defines current_branch
-module Abak::Flow
-  module Branches
-    extend Forwardable
-
-    def_delegator "Abak::Flow::Git.instance", :git
-
-    def self.current_branch
-      Branch.new git.branches[git.current_branch]
-    end
-
-    # ==========================================================================
-    # TODO : Refactor
-    # 3. Statistics & Cleaning
-    #
-    # => PullRequest.garbage
-    # => PullRequest.clean
-    # => PullRequest.clean(hard: true)
-    def self.garbage
-      Project.init
-      [Project.upstream.repo, Project.origin.repo].map(&:fetch)
-
-      branches = GithubClient.connection.branches(Project.origin.to_s)
-                             .reject { |branch| %w(master develop).include? branch.name }
-
-      messages = Messages.new "pull_request.garbage"
-      messages << [:collected_branches, {count: branches.count}]
-
-      branches.each_with_index do |branch, index|
-
-        # WRONG PREFIX
-        upstream_branch = Git.command_lines("branch", ["-r", "--contain", branch.commit.sha])
-                             .select { |branches| branches.include? "upstream/#{branch.prefix}" }
-
-        local_sha = git.branches[branch.name] ? git.branches[branch.name].gcommit.sha : ""
-
-        statuses = {
-          branch_unused: upstream_branch.empty?,
-          branch_differ: !local_sha.empty? && local_sha != branch.commit.sha,
-          branch_missing: local_sha.empty?
-        }
-
-        unless statuses.values.inject &:|
-          messages << [:deletion_allowed, {index: index, branch_name: branch.name}]
-          next
-        end
-
-        diagnoses = statuses.select { |_, bool| bool }.
-                             map { |name, _| messages.t name }.
-                             map { |msg| "   ↪ #{msg}" }.
-                             join("\n")
-
-        if statuses.select { |_, bool| bool }.keys == [:missing]
-          messages << [:deletion_possibly, {index: index, branch_name: branch.name, diagnoses: diagnoses}]
-        else
-          messages << [:deletion_restricted, {index: index, branch_name: branch.name, diagnoses: diagnoses}]
-        end
-      end
-
-      messages
-    end
-
-
-  end
-end

data/lib/abak-flow/messages.rb

@@ -1,86 +0,0 @@
-# coding : utf-8
-require "i18n"
-
-# TODO : Нужен простой метод, для перевода без скоупа
-module Abak::Flow
-  class Messages
-    extend Forwardable
-
-    attr_reader :scope, :elements
-
-    def initialize(scope)
-      Configuration.instance
-
-      @scope = scope
-      @elements = []
-    end
-
-    # Iterate elements from locale scope (translating online)
-    #
-    # Returns nothing
-    def each
-      raise ArgumentError, "No block given" unless block_given?
-
-      elements.each do |key|
-        yield translate(key)
-      end
-    end
-
-    # Put item to elements
-    #
-    # Returns Symbol
-    def push(element)
-      @elements << element
-    end
-    alias :<< :push
-
-    # section header from locale scope
-    #
-    # Returns String
-    def header
-      translate :header
-    end
-
-    # Print all elements from locale scope without header
-    #
-    # Returns Symbol
-    def to_s
-      return "" if elements.empty?
-
-      elements.collect { |element| translate *element } * "\n"
-    end
-
-    def print
-      return "" if elements.empty?
-
-      all_elements = []
-      elements.each_with_index do |element, index|
-        all_elements << "#{index + 1}. #{translate(*element)}"
-      end
-
-      all_elements * "\n"
-    end
-
-    # Print section header from locale scope and all elements from scope
-    #
-    # Returns String
-    def pretty_print
-      return "" if elements.empty?
-
-      [header, print] * "\n\n"
-    end
-    alias :pp :pretty_print
-
-    def translate(key, options = {})
-      I18n.t key, {scope: scope}.merge!(options)
-    end
-    alias :t :translate
-
-    def purge!
-      @elements = []
-    end
-
-    private
-    def_delegator :elements, :empty?
-  end
-end