octopolo 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 432e910dc903f53748dd91a860fbaee266bc4adf
-  data.tar.gz: b70ac1dd46b538625ef6c2535afc598bc9566860
+  metadata.gz: a6a67ceec3847ae82cd909737bf2b46f62158dab
+  data.tar.gz: c4c8486b109e1a402c8cf77ad5af2f7cc4ebb249
 SHA512:
-  metadata.gz: a0a05cdd533e6a7c0a927cb6ede96fc779556d6e988f4332d79d2ae3617f962418309d9f750581e35f6e6b92f67b76f822db941e9709ea00d8028c8f17170479
-  data.tar.gz: 0ec4e43d17a7f14acb90ad49ca11a8799e74677d94076666270df508f7f20665f276ff5e6dd1d8408a2d1c8af29107069d3a43ff2c779487bc7c64ebe0f7fb6e
+  metadata.gz: 94940d74fb753515939e99b38cd9ab386cff1b78ae1232f4f63a5442df0f30430555202b87f48b7c91d90db1ca48df4af203588fa265b592f35c6f669ed41596
+  data.tar.gz: ea460b23ad0cbb4054936d5cf017480c1e04d1b1227164984b02a9e3f2611466ef555c09bf2d40b43f5e718d1a487a2d9a58780e8953c531e1fe9a69dfde46d2

data/.gitignore

@@ -16,6 +16,7 @@ test/version_tmp
 tmp
 log/
 .idea
+.DS_Store
 
 # YARD artifacts
 .yardoc

data/CHANGELOG.markdown

@@ -1,3 +1,4 @@
+#### v1.2.1
 #### v1.2.0
 * View PR in Browser
 

data/lib/octopolo/commands/issue.rb

@@ -1,10 +1,7 @@
 desc "Create an issue for the current project."
 command 'issue' do |c|
-  config = Octopolo::Config.parse
-  user_config = Octopolo::UserConfig.parse
-
   c.desc "Use $EDITOR to update PR description before creating"
-  c.switch [:e, :editor], :default_value => user_config.editor
+  c.switch [:e, :editor], :default_value => Octopolo.user_config.editor
 
   c.action do |global_options, options, args|
     require_relative '../scripts/issue'

data/lib/octopolo/commands/pull_request.rb

@@ -1,13 +1,10 @@
 desc "Create a pull request from the current branch to the application's designated deploy branch."
 command 'pull-request' do |c|
-  config = Octopolo::Config.parse
-  user_config = Octopolo::UserConfig.parse
-
   c.desc "Branch to create the pull request against"
-  c.flag [:d, :dest, :destination], :arg_name => "destination_branch", :default_value => config.deploy_branch
+  c.flag [:d, :dest, :destination], :arg_name => "destination_branch", :default_value => Octopolo.config.deploy_branch
 
   c.desc "Use $EDITOR to update PR description before creating"
-  c.switch [:e, :editor], :default_value => user_config.editor
+  c.switch [:e, :editor], :default_value => Octopolo.user_config.editor
 
   c.action do |global_options, options, args|
     require_relative '../scripts/pull_request'

data/lib/octopolo/commands/sync_branch.rb

@@ -1,8 +1,7 @@
-config = Octopolo::Config.parse
-long_desc "branch - Which branch to merge into yours (default: #{config.deploy_branch})"
+long_desc "branch - Which branch to merge into yours (default: #{Octopolo.config.deploy_branch})"
 
 arg :branch
-desc "Merge the #{config.deploy_branch} branch into the current working branch"
+desc "Merge the #{Octopolo.config.deploy_branch} branch into the current working branch"
 command 'sync-branch' do |c|
   c.action do |global_options, options, args|
     require_relative '../scripts/sync_branch'

data/lib/octopolo/config.rb

@@ -88,11 +88,13 @@ module Octopolo
     # end defaults
 
     def self.parse
-      new(attributes_from_file)
+      new(attributes_from_file || {})
     end
 
     def self.attributes_from_file
-      YAML.load_file(octopolo_config_path)
+      if path = octopolo_config_path
+        YAML.load_file(path)
+      end
     end
 
     def self.octopolo_config_path
@@ -104,8 +106,7 @@ module Octopolo
         if old_dir != Dir.pwd
           octopolo_config_path
         else
-          Octopolo::CLI.say "Could not find #{FILE_NAMES.join(' or ')}"
-          exit
+          Octopolo::CLI.say "*** WARNING: Could not find #{FILE_NAMES.join(' or ')} ***"
         end
       end
     end

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/octopolo/config_spec.rb

@@ -237,8 +237,8 @@ module Octopolo
 
       it "gives up if it can't find a config file" do
         File.stub(:exists?) { false }
-        Octopolo::CLI.should_receive(:say).with("Could not find .octopolo.yml or .automation.yml")
-        lambda { subject.octopolo_config_path }.should raise_error(SystemExit)
+        Octopolo::CLI.should_receive(:say).with("*** WARNING: Could not find .octopolo.yml or .automation.yml ***")
+        subject.octopolo_config_path
         Dir.chdir project_working_dir
       end
 

data/spec/octopolo/github/pull_request_spec.rb

@@ -298,6 +298,7 @@ module Octopolo
 
         it "calls GitHub.pull_requests with the current repo/branch and return a single pull request" do
           Git.should_receive(:current_branch) { branch_name }
+          CLI.should_receive(:say).with("Pull request for current branch is number #{pr_number}")
           GitHub.should_receive(:search_issues) { double(total_count: 1, items: [pull]) }
           PullRequest.current.should == pull
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Patrick Byrne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -193,7 +193,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-gemset"
-- ".ruby-version"
 - ".soyuz.yml"
 - ".travis.yml"
 - CHANGELOG.markdown
@@ -269,7 +268,6 @@ files:
 - lib/octopolo/version.rb
 - lib/octopolo/week.rb
 - octopolo.gemspec
-- spec/.DS_Store
 - spec/octopolo/cli_spec.rb
 - spec/octopolo/config_spec.rb
 - spec/octopolo/convenience_wrappers_spec.rb
@@ -334,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A set of GitHub workflow scripts to provide a smooth development process

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1