papa 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e87718a595e00d18101632e567e76800eb8a4c18
-  data.tar.gz: 710dd0ab237970178c13f774b14d049d20475fb3
+  metadata.gz: 29c3cafcfd5212f7d354e02cb1877aece9e90097
+  data.tar.gz: fcef6587e224a9c6681f801af755f86012f49e5c
 SHA512:
-  metadata.gz: 0d6d937ed501f316b1203527f8ae2a6d6a104a88041fd37336978bd3b61b147b709faa9e3bec5e039d93060eaa78037151887c4750aa77503cc8a66a6dc04f77
-  data.tar.gz: 7c47861b1d7a9cafd95efcb488a43b6beb1dc3affe89850f0011d4bf9078f612300d2621c045b97640a1c97df21368ed96d21a6b5df6f9316286243807dcd52a
+  metadata.gz: ea5bed3fe00376c47612c38a57cde14cbcd7667137f62c716a6a9006d2ab53fd851f24cd29c22ad0bdaca9c2111d9fcf61aa30de8612ef339c979abe602d7c68
+  data.tar.gz: f56b5d6c01acc1490b0d68bd7b336d17f30f688d8caf8c3a6cd799b69082cbb823c76659747e1519672ad2b4692a0d71e2e56079c33d89520d3d81f80e09686c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.1
+* Check whether build branch exists before prompting vi
+* Add preceeding newlines in vi prompt
+* Make success and error messages easier to read
+
 ## 0.4.0
 * Classes have been housed into their own modules
 * Minor change to how commands are run, but shouldn't affect functionality

data/lib/papa/helper/output.rb

@@ -27,10 +27,12 @@ module Papa
         STDERR.puts message.strip.red
       end
 
-      def self.failure_reason(messages)
-        messages.each do |message|
-          STDERR.puts "  #{message}"
-        end
+      def self.success_info(message)
+        puts message
+      end
+
+      def self.failure_info(message)
+        STDERR.puts message
       end
 
       def self.build_output(message)

data/lib/papa/helper/vi.rb

@@ -24,6 +24,8 @@ module Papa
 
       def initialize_file
         content = <<-CONTENT
+
+
 # Add your branches here. One branch name per line.
 # Lines starting in pound (#) will be ignored
 # Sample:
@@ -45,7 +47,7 @@ module Papa
           else
             branch
           end
-        end.compact
+        end.compact.uniq
       end
 
       def delete_file

data/lib/papa/task/common/add.rb

@@ -14,10 +14,11 @@ module Papa
     module Common
       class Add
         def run
-          check_branches
-
           @build_branch ||= "#{@build_type}/#{@version}"
 
+          check_if_build_branch_exists
+          check_if_branches_are_given
+
           success = true
           @success_branches = []
           @failed_branches = []
@@ -64,52 +65,60 @@ module Papa
 
         private
 
-        def check_branches
+        def check_if_build_branch_exists
+          queue = [
+            Command::Git::Fetch.new('origin'),
+            Command::Git::Checkout.new(@build_branch)
+          ]
+          runner = Runner.new(queue)
+          return if runner.run
+          Helper::Output.failure 'Build branch does not exist.'
+          exit 1
+        end
+
+        def check_if_branches_are_given
           return unless @branches.empty?
           require 'papa/helper/vi'
           vi_file_helper = Helper::Vi.new
           @branches = vi_file_helper.run
         end
 
-        def success_cleanup
-          queue = @branches.map { |branch| Command::Git::BranchDelete.new(branch) }
-          Runner.new(queue).run
-        end
-
         def success_message
           return if @success_branches.empty?
-          output = ''
-          output << "Successfully added these branches to #{@build_branch}:\n"
+          Helper::Output.success "Successfully added these branches to #{@build_branch}:\n"
+          info = ''
           @success_branches.each_with_index do |branch, index|
-            output << "  #{index + 1}.) #{branch}\n"
+            info << "  #{index + 1}.) #{branch}\n"
           end
-          Helper::Output.success output
-        end
-
-        def failure_cleanup
+          Helper::Output.success_info info
         end
 
         def failure_message
           return if @failed_branches.empty?
 
-          output = ''
-
-          output << "Failed to add these branches to #{@build_branch}:\n"
+          Helper::Output.failure "Failed to add these branches to #{@build_branch}:\n"
+          info = ''
           @failed_branches.each_with_index do |failed_branch, index|
             branch = failed_branch[:branch]
             message = failed_branch[:message]
-            output << "  #{index + 1}.) #{branch}\n"
-            output << "      - #{message}\n"
+            info << "  #{index + 1}.) #{branch}\n"
+            info << "      - #{message}\n"
           end
-
-          output << "\n"
+          info << "\n"
 
           branch_names = @failed_branches.map { |f| f[:branch] }
+          info << "When the above problems are resolved, you can re-run this with:\n"
+          info << "  papa #{@build_type} add -v #{@version} -b #{branch_names.join(' ')}"
+
+          Helper::Output.failure_info info
+        end
 
-          output << "When the above problems are resolved, you can re-run this with:\n"
-          output << "  papa #{@build_type} add -v #{@version} -b #{branch_names.join(' ')}"
+        def success_cleanup
+          queue = @branches.map { |branch| Command::Git::BranchDelete.new(branch) }
+          Runner.new(queue).run
+        end
 
-          Helper::Output.failure output
+        def failure_cleanup
         end
       end
     end

data/lib/papa/task/common/finish.rb

@@ -49,22 +49,22 @@ module Papa
         private
 
         def success_message
-          output = ''
-          output << "Successfully merged #{@build_branch} to these branches:\n"
+          Helper::Output.success "Successfully merged #{@build_branch} to these branches:\n"
+          info = ''
           @success_branches.each_with_index do |branch, index|
-            output << " #{index + 1}.) #{branch}\n"
+            info << " #{index + 1}.) #{branch}\n"
           end
-          Helper::Output.success output
+          Helper::Output.success_info info
         end
 
         def failure_message
           failed_branches = @base_branches - @success_branches
-          output = ''
-          output << "Failed to merge #{@build_branch} to these branches:\n"
+          Helper::Output.failure "Failed to merge #{@build_branch} to these branches:\n"
+          info = ''
           failed_branches.each_with_index do |branch, index|
-            output << " #{index + 1}.) #{branch}\n"
+            info << " #{index + 1}.) #{branch}\n"
           end
-          Helper::Output.failure output
+          Helper::Output.failure_info info
         end
       end
     end

data/lib/papa/version.rb

@@ -1,3 +1,3 @@
 module Papa
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/papa.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papa
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - boggs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helper gem for inDinero's git workflow
 email:
 - hello@boggs.xyz