bb-flow 0.1.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0d4d74ad7aa4c5f5145d51260ef78a9ffaf99f
-  data.tar.gz: 7f88dfb42644f2a4707ea43b93ef264739f2291e
+  metadata.gz: e3faa34540e4510abeb1c59b4952b9e469b3c6db
+  data.tar.gz: 9fb3053a6282421986a4b437f481b6263bb3346e
 SHA512:
-  metadata.gz: c6e5ff479bc5a71682766b425d63bd5646a2f727078a2dd85a8d7d3d79b39cb7eeab6af60251fa21bddda1bc74e0d59b193a66ba0933a19e9905fc69e4ea1b9e
-  data.tar.gz: 9ff36f8a05a65b275c6662e84def0acb9945cab21a940fb8db6ffbd5166650a920e723037a6aaa0d4b94ea7c7f8e0525c899c5f9f5c1d4555990a102fc1c97ce
+  metadata.gz: b4d781b7b3296dfcca657237d789d95fccb87ddd899f75d346bb28ea87efe562d068ace17e19097d2d5eab707e2f200099c3711e65ed14a06454ab81604ede46
+  data.tar.gz: a29747a78c33ff25bde7d52920e9422fba88b5d64ccac11fac2c58468307b513db4c3e34f369e16e9c956f9fadcf1c4b733d30d5d2b376d3bdefdf90ab1cb908

data/.ruby-gemset

@@ -0,0 +1 @@
+bb-flow

data/.ruby-version

@@ -0,0 +1 @@
+2.1.2

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+#### 0.3.0
+
+* PR: Open in your browser after creating.
+* PR: Allow to specify the base branch (useful when you need to merge into a release branch).
+* PR: Ask whether to move the cards if merging into a non-default branch.
+* PR: Add the Trello icon in front of card links.
+* PR: Sort labels alphabetically.
+* PR: Guess which labels to apply.
+* Align card titles after the list of [MODULES].
+
+#### 0.2.0
+
+* PR: Add GitHub pull requests via the Trello PowerUp
+* Commit: Add commits via the Trello PowerUp
+
+#### 0.1.5
+
+* PR: Add a possibility to attach labels
+
 #### 0.1.4
 
 * Check for updates on start.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bb-flow (0.1.4)
+    bb-flow (0.3.0)
       ansi-select (= 0.3.4)
       colorize (~> 0.7.7)
       git (~> 1.2.9.1)
@@ -12,10 +12,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -40,10 +40,10 @@ GEM
     json (1.8.3)
     memoist (0.12.0)
     method_source (0.8.2)
-    mime-types (2.6.2)
-    minitest (5.8.1)
+    mime-types (2.99)
+    minitest (5.8.3)
     multipart-post (2.0.0)
-    netrc (0.10.3)
+    netrc (0.11.0)
     oauth (0.4.7)
     octokit (4.1.1)
       sawyer (~> 0.6.0, >= 0.5.3)
@@ -89,10 +89,10 @@ PLATFORMS
 
 DEPENDENCIES
   bb-flow!
-  bundler (~> 1.10.6)
+  bundler (~> 1.11)
   pry (~> 0.10.2)
   rake (~> 10.4.2)
   rubocop (~> 0.34.2)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/bb-flow.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colorize', '~> 0.7.7'
   spec.add_dependency 'octokit', '~> 4.1.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.10.6'
+  spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'pry', '~> 0.10.2'
   spec.add_development_dependency 'rake', '~> 10.4.2'
   spec.add_development_dependency 'rubocop', '~> 0.34.2'

data/bin/bb-flow

@@ -13,8 +13,6 @@ Commands are:
 See 'bb-flow COMMAND --help' for more information on a specific command.
 HELP
 
-options = {}
-
 global = OptionParser.new do |opts|
   opts.banner = 'Usage: bb-flow [options] [command [options]]'
   opts.separator ''
@@ -33,33 +31,26 @@ end
 subcommands = {
   commit: OptionParser.new do |opts|
     opts.banner = 'Usage: commit [options]'
-    opts.on('-m', '--message MESSAGE', 'Commit message') do |m|
-      options[:message] = m
+    opts.on('-m', '--message MESSAGE', 'Commit message') do |commit_message|
+      BBFlow::Options.set(:commit_message, commit_message)
     end
   end,
   pr: OptionParser.new do |opts|
     opts.banner = 'Usage: pr'
+    opts.on('-b', '--base-branch BRANCH_NAME', 'The branch to merge into. DEFAULT: master') do |base_branch|
+      BBFlow::Options.set(:base_branch, base_branch)
+    end
   end
 }
 
 begin
   global.order!
-  options[:command] = command = (ARGV.shift || '').to_sym
-  mandatory = {
-    commit: [],
-    pr: []
-  }
-  if !command || !mandatory[command]
+  command = (ARGV.shift || '').to_sym
+  if command.blank?
     puts global
     exit
   end
   subcommands[command].order! if subcommands[command]
-  missing = mandatory[command].select { |param| options[param].nil? }
-  unless missing.empty?
-    puts "Missing options: #{missing.join(', ')}"
-    puts subcommands[command]
-    exit
-  end
 rescue OptionParser::InvalidOption, OptionParser::MissingArgument => exception
   puts exception.message
   exit(1)
@@ -69,4 +60,4 @@ if Gem::Platform.local.os == 'darwin' && !File.exist?(BBFlow::Persistent::Store.
   Thread.new { `say "Hi. It seems to be your first time running bb-flow. I hope you will like it. By the way, in this session I'll ask you more questions that usual: don't be scared, next time it will be a lot simpler."` }
 end
 
-BBFlow::Application.run(options)
+BBFlow::Application.run(command)

data/lib/bb_flow.rb

@@ -20,18 +20,19 @@ require_relative 'bb_flow/pull_requester'
 require_relative 'bb_flow/trello'
 require_relative 'bb_flow/github'
 require_relative 'bb_flow/updater'
+require_relative 'bb_flow/options'
 
 module BBFlow
   class Application
-    # @param [Hash] options
+    # @param [Symbol] command
     #
     # @return [void]
-    def self.run(options)
-      case options[:command]
+    def self.run(command)
+      case command
       when :commit
         return puts Misc.execute('git commit') if Misc.execute('git diff-index HEAD --name-only --cached').empty?
 
-        message = options[:message] || Misc.edit
+        message = (Options.get(:message) || Misc.edit).strip
         cards = Trello.cards
         cards = Printer.select_items(cards, 'Which cards does this commit address?') unless cards.blank?
         card_lines = cards.map do |card|
@@ -40,18 +41,18 @@ module BBFlow
         # TODO: re-write with plumbing commands
         # e.g. git write-tree | xargs git commit-tree -m'message'
         Misc.execute("git commit -m \"#{message}\n\n#{card_lines}\"")
-        commit_sha = Misc.execute('git show-ref --head -s /HEAD/')
+        commit_sha = Misc.execute('git show-ref --head -s /HEAD/').strip
         # TODO: convert to http url.
         commit_url = "#{Github.http_url}/commit/#{commit_sha}"
 
         cards.each do |card|
-          card.add_comment("Commit: #{options[:message]}\n#{commit_url}")
-          Printer.success("Added a comment to the „#{card.name}“ card (#{card.url}).")
+          card.add_attachment(commit_url, message)
+          Printer.success("Added the commit to the „#{card.name}“ card (#{card.url}).")
         end
       when :pr
         PullRequester.create!
       else
-        Printer.panic("Incorrect parameter: #{options[:command]}")
+        Printer.panic("Incorrect parameter: #{command}")
       end
     end
   end

data/lib/bb_flow/github.rb

@@ -18,12 +18,12 @@ module BBFlow
 
       # @return [Array<Sawyer::Resource>]
       memoize def commits_info
-        octokit.compare(repository_name, 'master', local_branch).commits
+        octokit.compare(repository_name, Options.get(:base_branch), local_branch).commits
       end
 
       # People who worked with you on this branch.
       #
-      # @return [Array<String]
+      # @return [Array<String>]
       memoize def other_branch_committers
         (commits_info.map(&:author) + commits_info.map(&:committer)).map(&:login).uniq - [octokit.user.login]
       end
@@ -39,7 +39,7 @@ module BBFlow
       # @return [Sawyer::Resource] the newly created pull request.
       def create_pull_request(title, body)
         puts 'Creating a pull request...'
-        octokit.create_pull_request(repository_name, 'master', local_branch, title, body)
+        octokit.create_pull_request(repository_name, Options.get(:base_branch), local_branch, title, body)
       end
 
       # @return [Array<Array<String>>] Array<[login, name]>
@@ -48,6 +48,21 @@ module BBFlow
         octokit.collaborators(repository_name).map(&:login).sort.map(&octokit.method(:user)).map { |user| [user.login, user.name] }
       end
 
+      # @return [Array<String>]
+      persistent local def labels
+        puts 'Fetching repository labels...'
+        octokit.labels(repository_name).map(&:name)
+      end
+
+      # @param [Sawyer::Resource] pull_request
+      # @param [Array<String>] labels
+      #
+      # @return [void]
+      def add_labels_to_pull_request(pull_request, labels)
+        puts 'Adding labels to pull request...'
+        octokit.add_labels_to_an_issue(repository_name, pull_request, labels)
+      end
+
       # @return [Boolean]
       def has_branch?
         Misc.git.is_remote_branch?(local_branch)
@@ -64,6 +79,10 @@ module BBFlow
         Misc.execute(git_command).strip.to_i
       end
 
+      memoize def changed_files
+        Misc.execute("git diff --name-only #{Options.get(:base_branch)} #{remote_branch}").split
+      end
+
       # @return [String]
       def remote_name
         remote.name

data/lib/bb_flow/misc.rb

@@ -5,6 +5,19 @@ module BBFlow
     class << self
       extend Memoist
 
+      # @param [String] url
+      #
+      # @return [void]
+      def open_url(url)
+        if Gem::Platform.local.os == 'darwin'
+          execute("open #{url}")
+        else
+          # FIXME: I'm not sure what's the proper way to open URLs on either Linux
+          #        or Windows. If it's important for you, don't hesitate to edit.
+          puts(url)
+        end
+      end
+
       # @param [Array<Object>] args
       #
       # @return [String]
@@ -39,6 +52,14 @@ module BBFlow
       memoize def editor
         [`git config --global core.editor`.chomp.split(/\s+/), ['vi']].reject(&:empty?).first
       end
+
+      # @param [String] word
+      # @param [Fixnum] count
+      #
+      # @return [String]
+      def pluralize(word, count)
+        count == 1 ? word : word + 's'
+      end
     end
   end
 end

data/lib/bb_flow/options.rb

@@ -0,0 +1,44 @@
+
+module BBFlow
+  class Options
+    class << self
+      ALLOWED_OPTIONS = {
+        base_branch: { default_value: 'master' },
+        commit_message: {}
+      }
+
+      # @param [Symbol] name
+      # @param [Object] value
+      #
+      # @raise [ArgumentError]
+      # @return [void]
+      def set(name, value)
+        raise ArgumentError "Trying to set an unknown option #{name}" unless ALLOWED_OPTIONS.keys.include?(name)
+
+        @storage ||= {}
+        @storage[name] = value
+      end
+
+      # @param [Symbol] name
+      #
+      # @raise [ArgumentError]
+      # @return [Object]
+      def get(name)
+        raise ArgumentError, "Trying to get an unknown option #{name}" unless ALLOWED_OPTIONS.keys.include?(name)
+
+        @storage ||= {}
+        @storage[name] || default(name)
+      end
+
+      # @param [Symbol] name
+      #
+      # @raise [ArgumentError]
+      # @return [Object]
+      def default(name)
+        raise ArgumentError, "Trying to get a default for an unknown option #{name}" unless ALLOWED_OPTIONS.keys.include?(name)
+
+        ALLOWED_OPTIONS[name][:default_value]
+      end
+    end
+  end
+end

data/lib/bb_flow/pull_requester.rb

@@ -19,18 +19,27 @@ module BBFlow
         else
           response = Github.create_pull_request(title, Misc.edit(body_template) + ADVERTISEMENT)
 
+          unless labels.empty?
+            Github.add_labels_to_pull_request(response.number, labels)
+          end
+
           unless cards.empty?
-            add_link_to_cards(response.html_url)
-            move_cards_to_done_list
+            add_pull_request_to_cards(response)
+
+            if Options.get(:base_branch) == Options.default(:base_branch) ||
+               Printer.simple_question("You're going to merge into a non-default branch. Would you still like me to move the #{Misc.pluralize('card', cards.size)}?")
+              move_cards_to_done_list
+            end
           end
 
           Printer.success('The pull request has been created, sir.')
-          puts response.html_url
+          Misc.open_url(response.html_url)
         end
       rescue Octokit::Error => exception
         Printer.error(exception.message)
       end
 
+      # @return [void]
       def ensure_has_remote!
         unless Github.has_branch?
           question = "The branch isn't pushed yet. Would you like me to push it for you?"
@@ -45,6 +54,7 @@ module BBFlow
         end
       end
 
+      # @return [void]
       def ensure_pushed!
         unless Github.pushed?
           question = "Your local branch is ahead of '#{Github.remote_branch}' by #{Github.unpushed_commits_number} commits. Would you like me to push it?"
@@ -61,13 +71,15 @@ module BBFlow
         cards.each { |card| card.move_to_list(Trello.done_list) }
       end
 
-      # @param [String] url
-      def add_link_to_cards(url)
-        puts 'Adding the pull request link to the trello cards...'
+      # @param [Sawyer::Resource] pull_request
+      def add_pull_request_to_cards(pull_request)
+        puts 'Adding the pull request to the trello cards...'
 
-        cards.reject { |card| card.desc.include?(url) }.each do |card|
-          card.desc = "[Pull Request](#{url})\n\n#{card.desc}"
-          card.save
+        cards.reject { |card| card.attachments.map(&:url).include?(pull_request.html_url) }.each do |card|
+          # Note that this title is formatted in a special way that makes Trello recognize it as
+          # a GitHub PR instead of a regular attachment.
+          title = "#{pull_request.head.repo.name} ##{pull_request.number} #{pull_request.title}"
+          card.add_attachment(pull_request.html_url, title)
         end
       end
 
@@ -85,13 +97,12 @@ module BBFlow
       # @return [String]
       def body_template
         reviewers_md = reviewers.map { |login, _name| "- [ ] @#{login}" }
-        card_links = cards.map { |card| "  [#{card.name}](#{card.url})" }
+        card_links = cards.map { |card| %Q(<a href="#{card.url}"><img src="https://github.trello.services/images/trello-icon.png" width="12" height="12"> #{card.name}</a>) }
 
         body_parts = []
         body_parts << reviewers_md.join("\n") unless reviewers_md.empty?
 
         unless card_links.empty?
-          body_parts << '###### Trello'
           body_parts << card_links.join("\n")
         end
 
@@ -120,6 +131,19 @@ module BBFlow
         Persistent::Store.get(:local).transaction { |store| store['previous_reviewers'] = reviewers }
       end
 
+      # @return [Array<String>]
+      memoize def labels
+        labels = Github.labels.sort_by(&:downcase)
+        downcased = labels.map(&:downcase)
+
+        Printer.select_items(
+          labels,
+          'Which labels do you want to add to this pull request?',
+          formatter: ->(label) { label },
+          preselected: downcased.map(&guessed_labels(downcased).method(:include?))
+        )
+      end
+
       # @return [Array<Trello::Card>]
       memoize def cards
         return [] if Trello.cards.blank?
@@ -127,7 +151,7 @@ module BBFlow
         Printer.select_items(
           Trello.cards,
           'Which cards does it implement?',
-          formatter: ->(card) { [card.name, card.short_url] },
+          formatter: method(:format_trello_title),
           preselected: Trello.cards.map { |card| commit_messages.any? { |message| message.include?(card.short_url) } }
         )
       end
@@ -136,6 +160,31 @@ module BBFlow
       memoize def commit_messages
         Github.commits_info.reject { |info| info.parents.size > 1 }.map { |info| info.commit.message }
       end
+
+      # @param [Array<String>] labels
+      #
+      # @return [Array<String>]
+      def guessed_labels(labels)
+        specialized_predicates = {
+          'bugfix'      => -> { Trello.labels.include?('bug') },
+          'refactoring' => -> { Github.changed_files.size > 50 || commit_messages.map(&:downcase).any? { |message| message.include?('refactor') } },
+          'specs'       => -> { Github.changed_files.present? && Github.changed_files.all? { |file| file.start_with?('spec/') && file.end_with?('_spec.rb') } },
+          'wip'         => -> { %w(wip skip-ci).any?(&commit_messages.last.downcase.method(:include?)) },
+          'ui'          => -> { Github.changed_files.present? && Github.changed_files.all? { |file| file.start_with?('app/assets/stylesheets/') } }
+        }.tap { |hash| hash.default = ->() { false } }
+
+        labels.select { |label| Misc.git.current_branch.include?(label) || Trello.labels.include?(label) || specialized_predicates[label].call }
+      end
+
+      # @param [Trello::Card] card
+      #
+      # @return [Array<String>]
+      def format_trello_title(card)
+        prefix, _, title = card.name.rpartition(/(?<=\])\s*/) # At last closing square bracket.
+        _score, _, tags = prefix.rpartition(/(?<=\))\s*/) # After last parentheses.
+
+        [tags, title, card.short_url]
+      end
     end
   end
 end

data/lib/bb_flow/trello.rb

@@ -10,6 +10,11 @@ module BBFlow
         lists.flat_map { |list| list.cards.target }.select { |card| card.member_ids.include?(member.id) }
       end
 
+      # @return [Array<String>]
+      memoize def labels
+        cards.flat_map { |card| card.labels.target }.map(&:name).map(&:downcase)
+      end
+
       # @return [Trello::List]
       memoize def done_list
         trello::List.find(done_list_id)

data/lib/bb_flow/version.rb

@@ -5,11 +5,11 @@ module BBFlow
 
   # Current minor release.
   # @return [String]
-  MINOR = 1
+  MINOR = 3
 
   # Current patch level.
   # @return [String]
-  PATCH = 4
+  PATCH = 0
 
   # Full release version.
   # @return [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bb-flow
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors:
 - gregolsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi-select
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.6
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,8 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -174,6 +176,7 @@ files:
 - lib/bb_flow.rb
 - lib/bb_flow/github.rb
 - lib/bb_flow/misc.rb
+- lib/bb_flow/options.rb
 - lib/bb_flow/persistent.rb
 - lib/bb_flow/printer.rb
 - lib/bb_flow/pull_requester.rb
@@ -200,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simplifies typical BrightBytes work flows