bb-flow 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaad5df13ac0248603a75a04305949053a789e09
-  data.tar.gz: d79899d5adf15c52d6a3cef10ebf20fd7c944b18
+  metadata.gz: de6098e3affbd14a84dc640b84f8ace81036c612
+  data.tar.gz: 196e73e35c7185cbec8c26ecb5b867d423cf82f5
 SHA512:
-  metadata.gz: 7865436ce51793e5638fccff9f15d53ad2fd0021e1b3756678a9de20cc7ee0afc6307622b41725575d45a3fc64b937d6fd27d0d542229362379649ff1ccd54f7
-  data.tar.gz: e83860fa8be8127b8653f8bbec7c5bb6602b25f6acd459e6ab4f7b3c58a992f3f9b6cc326c8d57054efd32c4b08cd3aac808d4139dc892504d0dd843051f7b53
+  metadata.gz: 07e940a0826b56369ba4eadca2277e2ffee7b0e31c45268012438de89134c2c9001f839cb5706d0b879afe255d4809b32023c877334547839b4a614c35b5a9b2
+  data.tar.gz: 4941088c8fc32eaf3454abb378c0be8fd2109aded0906b88bace84ce93c8768e24faea4b776d2de1e2a94ed34249904ecdd3f96c2f33fe3305ea5b26fda2fc11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bb-flow (0.1.2)
+    bb-flow (0.1.3)
       ansi-select (~> 0.2.5)
       colorize (~> 0.7.7)
       git (~> 1.2.9.1)

data/bin/bb-flow

@@ -21,6 +21,11 @@ global = OptionParser.new do |opts|
     puts opts
     exit
   end
+
+  opts.on_tail("-v", "--version", "Show version") do
+    puts BBFlow::VERSION
+    exit
+  end
 end
 
 subcommands = {

data/lib/bb_flow/github.rb

@@ -17,7 +17,7 @@ module BBFlow
 
       # @return [Sawyer::Resource]
       def find_pull_request
-        octokit.pull_requests(repository_name).detect { |pr| pr.head.ref == branch_name }
+        octokit.pull_requests(repository_name).detect { |pr| pr.head.ref == local_branch }
       end
 
       # @param [String] title
@@ -26,7 +26,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', branch_name, title, body)
+        octokit.create_pull_request(repository_name, 'master', local_branch, title, body)
       end
 
       # @return [Array<Array<String>>] Array<[login, name]>
@@ -35,9 +35,20 @@ module BBFlow
         octokit.collaborators(repository_name).map(&:login).sort.map(&octokit.method(:user)).map { |user| [user.login, user.name] }
       end
 
+      # @return [Boolean]
+      def has_branch?
+        Misc.git.is_remote_branch?(local_branch)
+      end
+
       # @return [Boolean]
       def pushed?
-        branch_name
+        unpushed_commits_number == 0
+      end
+
+      # @return [Integer]
+      def unpushed_commits_number
+        git_command = "git rev-list --count HEAD ^#{remote_branch}"
+        Misc.execute(git_command).strip.to_i
       end
 
       # @return [String]
@@ -45,6 +56,11 @@ module BBFlow
         remote.name
       end
 
+      # @return [String]
+      def remote_branch
+        "#{remote_name}/#{local_branch}"
+      end
+
       private
 
       # @return [Octokit::Client]
@@ -77,9 +93,8 @@ module BBFlow
       end
 
       # @return [String]
-      def branch_name
-        rev = Misc.execute('git rev-parse --abbrev-ref --symbolic-full-name @{u}').strip
-        %r{(.*?)/(.*)}.match(rev)[2] unless rev.empty?
+      def local_branch
+        Misc.git.current_branch
       end
 
       # @return [String]

data/lib/bb_flow/persistent.rb

@@ -69,7 +69,7 @@ module BBFlow
       end
 
       def self.location(storage_type)
-        fail "Unknown store: #{name}" unless DIRS.keys.include?(storage_type)
+        fail "Unknown store: #{storage_type}" unless DIRS.keys.include?(storage_type)
 
         File.join(DIRS[storage_type], FILE_NAME)
       end

data/lib/bb_flow/printer.rb

@@ -11,6 +11,16 @@ module BBFlow
         gets.strip
       end
 
+      # @param [String] question
+      #
+      # @return [Boolean] positive answer
+      def simple_question(question)
+        yes = 'Yes, please'
+        no = 'No, thank you'
+
+        select_item([yes, no], question, formatter: :to_s.to_proc) == yes
+      end
+
       # @param [String] message
       #
       # @return [void]

data/lib/bb_flow/pull_requester.rb

@@ -9,6 +9,7 @@ module BBFlow
 
       # @return [void]
       def create!
+        ensure_has_remote!
         ensure_pushed!
 
         existing_pull_request = Github.find_pull_request
@@ -30,24 +31,30 @@ module BBFlow
         Printer.error(exception.message)
       end
 
-      def ensure_pushed!
-        unless Github.pushed?
-          yes = 'Yes, please'
-
-          case Printer.select_item(
-            [yes, 'No, thank you'],
-            "The branch isn't pushed yet. Would you like me to push it for you?",
-            formatter: :to_s.to_proc
-          )
-          when yes
+      def ensure_has_remote!
+        unless Github.has_branch?
+          question = "The branch isn't pushed yet. Would you like me to push it for you?"
+
+          if Printer.simple_question(question)
             Misc.execute("git push --set-upstream #{Github.remote_name} #{Misc.git.current_branch}")
           else
+            puts "Sorry, you should push your local branch to remote before creating a pull request."
             puts 'Exiting...'
             exit
           end
         end
       end
 
+      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?"
+
+          if Printer.simple_question(question)
+            Misc.execute("git push --set-upstream #{Github.remote_name} #{Misc.git.current_branch}")
+          end
+        end
+      end
+
       # @return [void]
       def move_cards_to_done_list
         puts "Moving cards to the „#{Trello.done_list.name}“ list..."
@@ -58,9 +65,7 @@ module BBFlow
       def add_link_to_cards(url)
         puts 'Adding the pull request link to the trello cards...'
 
-        cards.each do |card|
-          next if card.desc.include?(url)
-
+        cards.reject { |card| card.desc.include?(url) }.each do |card|
           card.desc = "[Pull Request](#{url})\n\n#{card.desc}"
           card.save
         end
@@ -124,7 +129,7 @@ module BBFlow
 
       # @return [Array<Git::Object::Commit>]
       memoize def commits
-        Misc.git.log.between('master', 'HEAD').to_a
+        Misc.git.log.object('--no-merges').between('master', 'HEAD').to_a
       end
     end
   end

data/lib/bb_flow/version.rb

@@ -9,7 +9,7 @@ module BBFlow
 
   # Current patch level.
   # @return [String]
-  PATCH = 2
+  PATCH = 3
 
   # 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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - gregolsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi-select