pivotal-github 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f59a52cc7afa00e5cb39764cc7ac45d6d82f787d
-  data.tar.gz: a903b9d4f792f69492faf90b3240b126b01dc522
+  metadata.gz: 45a58bb6127bbee7345696b43a96afc44fde54ee
+  data.tar.gz: 937b78962142d01fa2d252c4d632818490573d2c
 SHA512:
-  metadata.gz: 8b9d610a37af39dd35b60b573df29a2bf5f4f1dd7130c924e50edc018bb1d5016e5fcbf914c95023408d8b3f108c7cd0f733ba651bd4adb929330b8dcfed7cfb
-  data.tar.gz: f6f252b091ba275cfe887326ed33bd232168af5c97c4cb21c187e056e8ab34253b2de0d3ee64e1e1b0f283ff68ff1c7315db9c33b27e10ad98a9996b0b6bb3ab
+  metadata.gz: ba3a6db85f4bdea3eef8aa16e0e38a7eb5ae2aead40dc2123b7b27e845fce40b9eb06260ae585303c5ca7b52b7761683e32a34a0ab65d9ece1011e4e63bb21d0
+  data.tar.gz: 2f90885f4c94c5c07ba0cb9ea186de358b2f65c5a2e57a6f3098dc74992cea03501406ae1dea3d272f3708c72dca30b48364cf87abb0c8dbb7dd822797b168af

data/lib/pivotal-github/story_accept.rb

@@ -58,28 +58,26 @@ class StoryAccept < Command
     Nokogiri::XML(response.body).at_css('current_state').content == "accepted"
   end
 
-  def api_token
-    api_filename = '.api_token'
-    if File.exist?(api_filename)
-      @api_token ||= File.read(api_filename).strip
+  def config_filename(filename, description)
+    if File.exist?(filename)
+      add_to_gitignore(filename)
+      varname = '@' + filename.sub('.', '')
+      value = File.read(filename).strip
+      instance_variable_set(varname, value)
     else
-      puts "Please create a file called '#{api_filename}'"
-      puts "containing your Pivotal Tracker API token."
-      add_to_gitignore('.api_token')
+      puts "Please create a file called '#{filename}'"
+      puts "containing #{description}."
+      add_to_gitignore(filename)
       exit 1
     end
   end
 
+  def api_token
+    config_filename('.api_token', 'your Pivotal tracker API token')
+  end
+
   def project_id
-    project_id_filename = '.project_id'
-    if File.exist?(project_id_filename)
-      @project_id ||= File.read(project_id_filename).strip
-    else
-      puts "Please create a file called '.project_id'"
-      puts "containing the Pivotal Tracker project number."
-      add_to_gitignore('.project_id')
-      exit 1
-    end
+    config_filename('.project_id', 'the Pivotal tracker project id')
   end
 
   # Adds a filename to the .gitignore file (if necessary).
@@ -90,7 +88,9 @@ class StoryAccept < Command
     if File.exist?(gitignore)
       contents = File.read(gitignore)
       unless contents =~ /#{filename}/
-        File.open(gitignore, 'a') { |f| f.puts("\n" + filename) }
+        # Prepend a newline if the file doesn't end in a newline.
+        line = contents == contents.chomp ? "\n#{filename}" : filename
+        File.open(gitignore, 'a') { |f| f.puts(line) }
         puts "Added #{filename} to .gitignore"
       end
     end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Michael Hartl