story_branch 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94643738fef3522b3b25e155848a52e9bcf83ce5
-  data.tar.gz: 84f349af0a2f0772e11233fcf0e259cb22272aed
+  metadata.gz: 1177647df695fb3f6484115ac9e97d45aea9a3df
+  data.tar.gz: 1cafb5c066769b0157314e08262be0affef543ab
 SHA512:
-  metadata.gz: e4e18c541709a138b85234b37b42f07e03236b027fb889a58bb55afe370c27dea694c613cd81c2b1c029cda9d4949188eb7c0df1b55fb35d4311ff1099f773a4
-  data.tar.gz: b7bf94918f1fb6b4c667f0b23d5b2185b81e47eef21e8fa98711bf38ec1cf45353ab1ed23884d0da4325af6317fd542ac9ccb9147f097efd31fe42bc3621846a
+  metadata.gz: 7194737e8a67fa453f6a025fd56c8628b2e75ec81de5c55e3a9746c2bdaaa983e965bea7571133d267ecfc7cfc9871f4ecc32453c49ff9b25ee84e2205fc2a42
+  data.tar.gz: 2c5d397bdf1c4184cd7317abd17d2078fac9826b2f7d58ba9f89f9695b3b49dbef75b6359692c490388932a05f23793e207d9ccae3f378cef84f9641b94fe7e1

data/README.md

@@ -42,10 +42,32 @@ Install the gem:
 
 #### Settings
 
-You must have a `PIVOTAL_API_KEY` environment variable set
-to your Pivotal api key, plus either a `.story_branch` file or
-`PIVOTAL_PROJECT_ID` environment variable set. Note, values in
-`.story_branch` will override environment variable settings.
+You can have your settings set either on a `.story_branch` file
+or in environment variables.
+
+The `.story_branch` files have priority over environment variables so if you set both,
+the configuration within `.story_branch` will be the one used.
+Also, the `.story_branch` file inside a project directory has priority over the global one.
+
+The settings will be loaded firstly from local config file, if not found then from global
+config file and ultimately from the environment variables. If none are found, an error
+will be thrown.
+
+This means that you can have a globally set api key and for each project using Pivotal Tracker
+have a local config inside the project folder.
+E.g.
+
+```
+$ cat ~/.story_branch
+api: your_API_key_that_you_get_from_pivotal_tracker
+
+$ cat ~/your_project_dir/.story_branch
+project: 123123
+```
+
+In case you prefer to use environment variables, you can set
+`PIVOTAL_API_KEY` to your pivotal tracker api key and set
+`PIVOTAL_PROJECT_ID` to your project id.
 
 #### .story_branch file
 

data/lib/story_branch.rb

@@ -103,7 +103,6 @@ module StoryBranch
     attr_accessor :p
 
     def initialize
-      @pivotal_info = YAML.load_file config_file if config_file
       @p = PivotalUtils.new
       @p.api_key = config_value 'api', 'PIVOTAL_API_KEY'
       @p.project_id = config_value 'project', 'PIVOTAL_PROJECT_ID'
@@ -202,12 +201,11 @@ module StoryBranch
       end
     end
 
-    def config_file
-      PIVOTAL_CONFIG_FILES.select{|conf| File.exists? conf}.first
-    end
-
     def config_value key, env
-      value = @pivotal_info[key] if @pivotal_info and @pivotal_info[key]
+      PIVOTAL_CONFIG_FILES.each do |config_file|
+        pivotal_info = YAML.load_file config_file
+        return pivotal_info[key] if pivotal_info[key]
+      end
       value ||= env_required env
       value
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story_branch
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Jason Milkins
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blanket_wrapper
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Story Branch - create git branches based on pivotal tracker stories