git_flower 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437cd16229bd94b676971ac50d6b86f4d792fe64
-  data.tar.gz: 171eee617b2500ead9a364c380effc833e1e082a
+  metadata.gz: 219b7cb4f97f5c3bd48bba2cb05d9bc3791cab5f
+  data.tar.gz: b8fd1884e0f8cde2508a9c81ddb8f167d8f40d09
 SHA512:
-  metadata.gz: ab3da35e297f3cab5bda3d0056722712f3dd659726139b43a6c5f3dbca42b5e98837e2b142eb43c92a99cbde882f3250a7eb0daa30f7f06ba11d84153c2a0e0c
-  data.tar.gz: 26397d79ff5f5deb4157587c1cab10c798271d65c6dbfa8e2c1dc24383370525712bfd65f372face2021b6d292d8ae5b1feb1f910312f4cd34c2acc9d3a4a936
+  metadata.gz: ea9d0473e1176e31aacaedb779324fe1cf6db314fa9786bd5435ea56b6be51674c40e019286559a129447e072f8d18f156fabfba436f927cb0f72dc971874369
+  data.tar.gz: 78932f0c4e5541d926f0dae0615a548f90c483d2236250e9888acded5b069ea18c2b625968d4dd7665f780ce40f55705a9b5e27fbe6f11c65a9b6cf88acf6bc3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_flower (0.1.1)
+    git_flower (0.1.2)
       activesupport (~> 5.1.2)
       faraday (~> 0.9.0)
       git (~> 1.3.0)

data/README.md

@@ -30,6 +30,8 @@ export PIVOTAL_TOKEN="TOKEN HERE"
 export PIVOTAL_PROJECT_ID="some_number_here"
 ```
 
+Make sure you have run `git flow init` on the project you want to use this gem with! Check out the [gitflow wiki](https://github.com/nvie/gitflow/wiki/Installation) for up to date installation instructions if you don't have git-flow yet.
+
 ## Usage
 
 The `git-flower create` commands will create a Pivotal story for your feature or hotfix, start a git-flow branch off of develop, and check out that branch. All you need to do is pass a story name, and it will set a titleized version as the Pivotal ticket name and a slugified version as the branch name.
@@ -61,7 +63,7 @@ feature/1234-save-all-the-cats
 
 Your Pivotal Feature would look something like this:
 
-![Pivotal Feature Example](https://photos-1.dropbox.com/t/2/AADrhIDYH53IfCbz1VtLnPrNYX0MIHau-ub8g2cqxyclxQ/12/49046/png/32x32/3/1499760000/0/2/git-flower-feature.png/EIbdIhi4-dHgBCACKAI/-z2SbCaiHwKR-cyBs3xEw6ru8kdKgh7Fr8NEtw75NFI?dl=0&size=2048x1536&size_mode=3)
+![Pivotal Feature Example](https://farm5.staticflickr.com/4279/35816647836_e20c3d465d_k.jpg)
 
 ### Hotfix
 
@@ -84,7 +86,7 @@ hotfix/5678-missing-cat
 
 Your Pivotal Bug would look something like this:
 
-![Pivotal Bug Example](https://photos-2.dropbox.com/t/2/AADERZmXtrsHQ202P285d5je1vTwaRHK6PZtQTNkknzbjQ/12/49046/png/32x32/3/1499763600/0/2/git-flower-bug.png/EIbdIhi4-dHgBCACKAI/VCWQS444mMy3075Fb1w4mf4vmfuz5js8GPKfI87yI_M?dl=0&size=2048x1536&size_mode=3)
+![Pivotal Bug Example](https://farm5.staticflickr.com/4207/35688101172_2cce13f24b_k.jpg)
 
 ### Hitch Integration
 
@@ -103,7 +105,9 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitLab at https://gitlab.com/alexwilkinson/git-flower. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitLab at https://gitlab.com/alexwilkinson/git-flower. If there isn't already an open Issue attempting to address your bug or feature request, please feel free to open one and I'll follow up within 24 hours.
+
+ This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/git_flower.rb

@@ -4,6 +4,9 @@ require "git_flower/feature"
 require "git_flower/hotfix"
 require "git_flower/git_repository"
 require "git_flower/pivotal_project"
+require "git_flower/feature-cli"
+require "git_flower/hotfix-cli"
+require "git_flower/branch"
 
 module GitFlower
 end

data/lib/git_flower/branch.rb

@@ -0,0 +1,17 @@
+module GitFlower
+  class Branch
+    def initialize(name:, id:, type:)
+      @story_name = name
+      @story_id = id
+      @type = type
+    end
+
+    def name
+      Shellwords.shellescape("#{type}/#{story_id}-#{story_name.parameterize}")
+    end
+
+    private
+
+    attr_reader :story_name, :story_id, :type
+  end
+end

data/lib/git_flower/feature-cli.rb

@@ -39,20 +39,8 @@ module GitFlower
       feature = Feature.new(
         story_name: story_name,
         labels: options[:labels],
-        project_id: project_id,
-        pivotal_token: pivotal_token
       )
       feature.save!
     end
-
-    private
-
-    def project_id
-      ENV['PIVOTAL_PROJECT_ID']
-    end
-
-    def pivotal_token
-      ENV['PIVOTAL_TOKEN']
-    end
   end
 end

data/lib/git_flower/git_repository.rb

@@ -1,4 +1,5 @@
 require 'git'
+require_relative 'branch'
 
 class GitError < StandardError; end
 class GitFlowError < StandardError; end
@@ -9,6 +10,11 @@ module GitFlower
       @repo = find_git_repo(path_to_repo)
     end
 
+    def start_branch(name:, id:, type:)
+      branch_name = GitFlower::Branch.new(name: name, id: id, type: type).name
+      @repo.branch(branch_name).checkout
+    end
+
     def validate_for_hotfix!
       puts "Checking for commited files"
       if has_added_files?

data/lib/git_flower/hotfix-cli.rb

@@ -39,20 +39,8 @@ module GitFlower
       hotfix = Hotfix.new(
         story_name: story_name,
         labels: options[:labels],
-        project_id: project_id,
-        pivotal_token: pivotal_token
       )
       hotfix.save!
     end
-
-    private
-
-    def project_id
-      ENV['PIVOTAL_PROJECT_ID']
-    end
-
-    def pivotal_token
-      ENV['PIVOTAL_TOKEN']
-    end
   end
 end

data/lib/git_flower/story.rb

@@ -6,11 +6,9 @@ require_relative 'pivotal_project'
 
 module GitFlower
   class Story
-    def initialize(story_name:, labels:, project_id:, pivotal_token:)
+    def initialize(story_name:, labels:)
       @story_name = story_name
       @labels = Array(labels)
-      @project_id = project_id
-      @pivotal_token = pivotal_token
     end
 
     def create_story!(type)
@@ -26,12 +24,14 @@ module GitFlower
       puts "Your pivotal story is https://www.pivotaltracker.com/story/show/#{story.id}"
       puts "Creating #{type} branch for #{story_name}"
 
-      `git flow #{type} start #{branch_name(story.id)}`
+      GitRepository.
+        new(Dir.pwd).
+        start_branch(name: story_name, id: story.id, type: type)
     end
 
     private
 
-    attr_reader :story_name, :labels, :project_id, :pivotal_token
+    attr_reader :story_name, :labels
 
     def validate_environment_and_arguments!
       if env_variable_undefined?(story_name)
@@ -55,6 +55,14 @@ module GitFlower
       PivotalProject.new(pivotal_token, project_id)
     end
 
+    def pivotal_token
+      ENV['PIVOTAL_TOKEN']
+    end
+
+    def project_id
+      ENV['PIVOTAL_PROJECT_ID']
+    end
+
     def derive_story_owners
       begin
         hitch_config = YAML.load_file("#{ENV['HOME']}/.hitchrc")
@@ -67,9 +75,5 @@ module GitFlower
         Array(ENV['USER'])
       end
     end
-
-    def branch_name(story_id)
-      Shellwords.shellescape("#{story_id}-#{story_name.parameterize}")
-    end
   end
 end

data/lib/git_flower/version.rb

@@ -1,3 +1,3 @@
 module GitFlower
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_flower
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alex Wilkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - exe/git-flower
 - git_flower.gemspec
 - lib/git_flower.rb
+- lib/git_flower/branch.rb
 - lib/git_flower/cli.rb
 - lib/git_flower/feature-cli.rb
 - lib/git_flower/feature.rb