bb-flow 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6098e3affbd14a84dc640b84f8ace81036c612
-  data.tar.gz: 196e73e35c7185cbec8c26ecb5b867d423cf82f5
+  metadata.gz: 1a0d4d74ad7aa4c5f5145d51260ef78a9ffaf99f
+  data.tar.gz: 7f88dfb42644f2a4707ea43b93ef264739f2291e
 SHA512:
-  metadata.gz: 07e940a0826b56369ba4eadca2277e2ffee7b0e31c45268012438de89134c2c9001f839cb5706d0b879afe255d4809b32023c877334547839b4a614c35b5a9b2
-  data.tar.gz: 4941088c8fc32eaf3454abb378c0be8fd2109aded0906b88bace84ce93c8768e24faea4b776d2de1e2a94ed34249904ecdd3f96c2f33fe3305ea5b26fda2fc11
+  metadata.gz: c6e5ff479bc5a71682766b425d63bd5646a2f727078a2dd85a8d7d3d79b39cb7eeab6af60251fa21bddda1bc74e0d59b193a66ba0933a19e9905fc69e4ea1b9e
+  data.tar.gz: 9ff36f8a05a65b275c6662e84def0acb9945cab21a940fb8db6ffbd5166650a920e723037a6aaa0d4b94ea7c7f8e0525c899c5f9f5c1d4555990a102fc1c97ce

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+#### 0.1.4
+
+* Check for updates on start.
+* PR: always join commit messages in the Changes section with a new line.
+* PR: CC people who committed to this branch.
+* Updated `ansi-select` from [0.2.5 to 0.3.4](https://github.com/shockone/ansi-select/blob/master/CHANGELOG.md)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    bb-flow (0.1.3)
-      ansi-select (~> 0.2.5)
+    bb-flow (0.1.4)
+      ansi-select (= 0.3.4)
       colorize (~> 0.7.7)
       git (~> 1.2.9.1)
       memoist (~> 0.12.0)
@@ -22,7 +22,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    ansi-select (0.2.5)
+    ansi-select (0.3.4)
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)

data/bb-flow.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'ansi-select', '~> 0.2.5'
+  spec.add_dependency 'ansi-select', '0.3.4'
   spec.add_dependency 'git', '~> 1.2.9.1'
   spec.add_dependency 'memoist', '~> 0.12.0'
   spec.add_dependency 'ruby-trello', '~> 1.3.0'

data/bin/bb-flow

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/bb-flow'
 require 'optparse'
+require_relative '../lib/bb-flow'
+
+BBFlow::Updater.ensure_up_to_date!
 
 subtext = <<HELP
 Commands are:

data/lib/bb_flow/github.rb

@@ -4,6 +4,7 @@ module BBFlow
   class Github
     class << self
       extend BBFlow::Persistent
+      extend Memoist
 
       # @return [String]
       def http_url
@@ -15,6 +16,18 @@ module BBFlow
         remote.url
       end
 
+      # @return [Array<Sawyer::Resource>]
+      memoize def commits_info
+        octokit.compare(repository_name, 'master', local_branch).commits
+      end
+
+      # People who worked with you on this branch.
+      #
+      # @return [Array<String]
+      memoize def other_branch_committers
+        (commits_info.map(&:author) + commits_info.map(&:committer)).map(&:login).uniq - [octokit.user.login]
+      end
+
       # @return [Sawyer::Resource]
       def find_pull_request
         octokit.pull_requests(repository_name).detect { |pr| pr.head.ref == local_branch }
@@ -64,8 +77,8 @@ module BBFlow
       private
 
       # @return [Octokit::Client]
-      def octokit
-        @octokit ||= Octokit::Client.new(access_token: token)
+      memoize def octokit
+        Octokit::Client.new(access_token: token)
       end
 
       # @return [String]
@@ -75,7 +88,7 @@ module BBFlow
       end
 
       # @return [Git::Remote]
-      def remote
+      memoize def remote
         remotes = Misc.git.remotes.select { |remote| remote.url.include?('github') }
 
         case remotes.size

data/lib/bb_flow/printer.rb

@@ -64,7 +64,7 @@ module BBFlow
       def select_item(items, title, formatter: :name.to_proc)
         puts
         note(title)
-        auxiliary('Move: arrows or j/k    Finish: return')
+        auxiliary('Move: arrows, j/k, or Ctrl-N/P    Finish: return')
         Ansi::Selector.select(items, formatter: formatter)
       end
 

data/lib/bb_flow/pull_requester.rb

@@ -5,7 +5,7 @@ module BBFlow
     class << self
       extend Memoist
 
-      AD = "\n\n<sub>This pull request has been created using [bb-flow](https://github.com/brightbytes/bb-flow).</sub>"
+      ADVERTISEMENT = "\n\n<sub>This pull request has been created using [bb-flow](https://github.com/brightbytes/bb-flow).</sub>"
 
       # @return [void]
       def create!
@@ -17,7 +17,7 @@ module BBFlow
         if existing_pull_request
           Printer.success("A pull request for this branch already exists.\n#{existing_pull_request.html_url}")
         else
-          response = Github.create_pull_request(title, Misc.edit(body_template) + AD)
+          response = Github.create_pull_request(title, Misc.edit(body_template) + ADVERTISEMENT)
 
           unless cards.empty?
             add_link_to_cards(response.html_url)
@@ -96,7 +96,12 @@ module BBFlow
         end
 
         body_parts << '###### Changes'
-        body_parts << commits.map(&:message).map(&:lines).map(&:first).map { |message| "  * #{message}" }.join
+        body_parts << commit_messages.map { |message| "  * #{message.lines.first.strip}" }.join("\n")
+
+        unless Github.other_branch_committers.empty?
+          logins = Github.other_branch_committers.map { |login| "@#{login}" }.join(", ")
+          body_parts << "CC: #{logins}"
+        end
 
         body_parts.join("\n\n")
       end
@@ -123,13 +128,13 @@ module BBFlow
           Trello.cards,
           'Which cards does it implement?',
           formatter: ->(card) { [card.name, card.short_url] },
-          preselected: Trello.cards.map { |card| commits.any? { |commit| commit.message.include?(card.short_url) } }
+          preselected: Trello.cards.map { |card| commit_messages.any? { |message| message.include?(card.short_url) } }
         )
       end
 
-      # @return [Array<Git::Object::Commit>]
-      memoize def commits
-        Misc.git.log.object('--no-merges').between('master', 'HEAD').to_a
+      # @return [Array<String>]
+      memoize def commit_messages
+        Github.commits_info.reject { |info| info.parents.size > 1 }.map { |info| info.commit.message }
       end
     end
   end

data/lib/bb_flow/updater.rb

@@ -0,0 +1,69 @@
+module BBFlow
+  class Updater
+    class << self
+      extend BBFlow::Persistent
+
+      CHECK_INTERVAL = 60 * 60 * 24 * 7
+
+      # @return [void]
+      def ensure_up_to_date!
+        return if recently_checked? || !update_available?
+
+        if Printer.simple_question("An update from #{current_version} to #{latest_version} is available. Should I install it?")
+          command = "gem install bb-flow -v '#{latest_version}'"
+          puts "Executing `#{command}`..."
+          `#{command}`
+
+          exit Printer.success("Hooray, the new version has been installed! You can find the changes here: https://github.com/brightbytes/bb-flow/blob/master/CHANGELOG.md")
+        end
+      rescue StandardError => exception
+        Printer.error("An error occurred while trying to self-update the gem: #{exception.message}")
+      ensure
+        update_last_check_unixtime!
+      end
+
+      private
+
+      # @return [Boolean]
+      def update_available?
+        puts "Looking for updates..."
+        latest_version > current_version
+      end
+
+      # @return [Gem::Version]
+      def latest_version
+        fetcher.search_for_dependency(dependency).first.map { |n, _| n.version }.first || Gem::Version.new('0')
+      end
+
+      # @return [Gem::Version]
+      def current_version
+        Gem::Version.new(BBFlow::VERSION)
+      end
+
+      # @return [Gem::SpecFetcher]
+      def fetcher
+        Gem::SpecFetcher.new(Gem::SourceList.from(['https://rubygems.org/']))
+      end
+
+      # @return [Gem::Dependency]
+      def dependency
+        Gem::Dependency.new('bb-flow')
+      end
+
+      # @return [Boolean]
+      def recently_checked?
+        last_check_unixtime + CHECK_INTERVAL > Time.now.to_i
+      end
+
+      # @return [Fixnum]
+      persistent global def last_check_unixtime
+        0
+      end
+
+      # @return [void]
+      def update_last_check_unixtime!
+        Persistent::Store.get(:global).transaction { |store| store['updater']['last_check_unixtime'] = Time.now.to_i }
+      end
+    end
+  end
+end

data/lib/bb_flow/version.rb

@@ -9,7 +9,7 @@ module BBFlow
 
   # Current patch level.
   # @return [String]
-  PATCH = 3
+  PATCH = 4
 
   # Full release version.
   # @return [String]

data/lib/bb_flow.rb

@@ -19,6 +19,7 @@ require_relative 'bb_flow/misc'
 require_relative 'bb_flow/pull_requester'
 require_relative 'bb_flow/trello'
 require_relative 'bb_flow/github'
+require_relative 'bb_flow/updater'
 
 module BBFlow
   class Application

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bb-flow
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - gregolsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi-select
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -177,6 +178,7 @@ files:
 - lib/bb_flow/printer.rb
 - lib/bb_flow/pull_requester.rb
 - lib/bb_flow/trello.rb
+- lib/bb_flow/updater.rb
 - lib/bb_flow/version.rb
 homepage: ''
 licenses: