Merge pull request #80 from chrisarcand/fix-config-require

Don't raise on missing config file

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'

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'

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'

lib/octopolo/config.rb

@@ -88,11 +88,13 @@ def semantic_versioning
     # 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 @@ def self.octopolo_config_path
         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

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