git_flower 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f30c2286addf8b6234c28f4c6c6eb2735bc277c
-  data.tar.gz: 97c03ad37b98adcd18a503b9f1bfaf824d9ff83f
+  metadata.gz: 19c0297fcd7615a932a0a3acec5ff4a2666a73ef
+  data.tar.gz: 79dbf666a97ab5ae0d05fe783b3cc23d04650433
 SHA512:
-  metadata.gz: ea2a592614d095d47d5954fe5c26636f64502288bdc7e066342b2cc0f42fba4f7917ea45fffa4f9c7becc7a8924b44bdf00dbb8d0aa2226059dace66993f497b
-  data.tar.gz: 81da16fa907d540b28cfce60493672afa5a805a5888a1924af9884413575e79113855a5d225f0148ea58d8d4b0e1d095c5c5eeaaf877319e5fc37e17f9b39651
+  metadata.gz: ed2a84fff3476ceabd56698396dc48f13dc6885ac4c518ff1ff2fc7cec0035eee48030a3b3b08621b859c6eda15ddc7585fc5f6faecba9ec69715ddc770ea9ef
+  data.tar.gz: 025cffe51830ccb074e114b772b71332f4251f1fd6d02fdc6097d570610ad01d4f26091b652ff9fe9a5f419c8c741f57f8992aaf254a8a608b9314a4d076649a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_flower (0.1.3)
+    git_flower (0.2.0)
       activesupport (~> 5.1.2)
       faraday (~> 0.9.0)
       git (~> 1.3.0)
@@ -34,6 +34,7 @@ GEM
     docile (1.1.5)
     equalizer (0.0.11)
     excon (0.57.1)
+    fakefs (0.11.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.11.0.1)
@@ -88,6 +89,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.15)
   byebug
+  fakefs (~> 0.11)
   git_flower!
   rake (~> 10.0)
   rspec (~> 3.0)

data/git_flower.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "simplecov", "~>0.14"
+  spec.add_development_dependency "fakefs", "~>0.11"
 
   spec.add_dependency "git", "~> 1.3.0"
   spec.add_dependency "thor", "~> 0.19.4"

data/lib/git_flower.rb

@@ -2,6 +2,7 @@ require "git_flower/version"
 require "git_flower/story"
 require "git_flower/feature"
 require "git_flower/hotfix"
+require "git_flower/git_service"
 require "git_flower/git_repository"
 require "git_flower/pivotal_project"
 require "git_flower/feature-cli"

data/lib/git_flower/feature.rb

@@ -13,7 +13,9 @@ module GitFlower
     private
 
     def validate_git_repository!
-      GitRepository.new(Dir.pwd).validate_for_feature!
+      GitService.
+        new(repository: GitFlower::GitRepository.new(Dir.pwd)).
+        validate_for_feature!
     end
 
     def create_feature!

data/lib/git_flower/git_repository.rb

@@ -1,8 +1,4 @@
 require 'git'
-require_relative 'branch'
-
-class GitError < StandardError; end
-class GitFlowError < StandardError; end
 
 module GitFlower
   class GitRepository
@@ -10,42 +6,18 @@ 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?
-        raise GitError, "Please commit or stash all added files."
-      end
-
-      puts "Checking if master and develop are up to date"
-      if !master_up_to_date? || !develop_up_to_date?
-        raise GitError, "Please pull --rebase master and develop"
-      end
-
-      puts "Checking for existing hotfix branch"
-      if has_existing_branch_name?("hotfix")
-        raise GitFlowError, "You already have an existing hotfix branch"
+    def find_git_repo(initial_dir)
+      if Dir.exist?('.git')
+        Git.open(initial_dir)
+      else
+        raise GitError, "Please navigate to the root of your git repository to use this gem."
       end
     end
 
-    def validate_for_feature!
-      puts "Checking for commited files"
-      if has_added_files?
-        raise GitError, "Please commit or stash all added files."
-      end
-
-      puts "Checking if develop is up to date"
-      if !develop_up_to_date?
-        raise GitError, "Please pull --rebase develop"
-      end
+    def checkout_branch(branch_name)
+      @repo.branch(branch_name).checkout
     end
 
-    private
-
     def has_added_files?
       !@repo.status.added.empty?
     end
@@ -65,22 +37,5 @@ module GitFlower
     def branch_up_to_date?(branch_name)
       @repo.revparse(branch_name) == @repo.revparse("origin/#{branch_name}")
     end
-
-    def no_git_repo_can_be_found
-      !system 'git status'
-    end
-
-    def find_git_repo(initial_dir)
-      if no_git_repo_can_be_found
-        raise GitError
-      end
-
-      if Dir.exist?('.git')
-        Git.open(initial_dir)
-      else
-        Dir.chdir('..')
-        find_git_repo(Dir.pwd)
-      end
-    end
   end
 end

data/lib/git_flower/git_service.rb

@@ -0,0 +1,52 @@
+require 'git'
+require_relative 'branch'
+require_relative 'git_repository'
+
+class GitError < StandardError; end
+class GitFlowError < StandardError; end
+
+module GitFlower
+  class GitService
+    def initialize(repository:)
+      @repository = repository
+    end
+
+    def start_branch(name:, id:, type:)
+      branch_name = GitFlower::Branch.new(name: name, id: id, type: type).name
+      repository.checkout_branch(branch_name)
+    end
+
+    def validate_for_hotfix!
+      puts "Checking for commited files"
+      if repository.has_added_files?
+        raise GitError, "Please commit or stash all added files."
+      end
+
+      puts "Checking if master and develop are up to date"
+      if !repository.master_up_to_date? || !repository.develop_up_to_date?
+        raise GitError, "Please pull --rebase master and develop"
+      end
+
+      puts "Checking for existing hotfix branch"
+      if repository.has_existing_branch_name?("hotfix")
+        raise GitFlowError, "You already have an existing hotfix branch"
+      end
+    end
+
+    def validate_for_feature!
+      puts "Checking for commited files"
+      if repository.has_added_files?
+        raise GitError, "Please commit or stash all added files."
+      end
+
+      puts "Checking if develop is up to date"
+      if !repository.develop_up_to_date?
+        raise GitError, "Please pull --rebase develop"
+      end
+    end
+
+    private
+
+    attr_reader :repository
+  end
+end

data/lib/git_flower/hotfix.rb

@@ -13,7 +13,9 @@ module GitFlower
     private
 
     def validate_git_repository!
-      GitRepository.new(Dir.pwd).validate_for_hotfix!
+      GitService.
+        new(repository: GitFlower::GitRepository.new(Dir.pwd)).
+        validate_for_hotfix!
     end
 
     def create_hotfix!

data/lib/git_flower/pivotal_project.rb

@@ -16,6 +16,10 @@ module GitFlower
       end
     end
 
+    private
+
+    attr_reader :project
+
     def create_hotfix(options)
       story_owner_ids = find_users(options[:owner_usernames]).map(&:id)
       project.create_story(name: options[:name],
@@ -35,10 +39,6 @@ module GitFlower
                            owner_ids: story_owner_ids)
     end
 
-    private
-
-    attr_reader :project
-
     def find_users(owner_usernames)
       project.memberships.map(&:person).select do |person|
         owner_usernames.include? person.email.split("@").first

data/lib/git_flower/story.rb

@@ -1,6 +1,7 @@
 require 'shellwords'
 require 'yaml'
 require 'active_support'
+require_relative 'git_service'
 require_relative 'git_repository'
 require_relative 'pivotal_project'
 
@@ -24,8 +25,8 @@ module GitFlower
       puts "Your pivotal story is https://www.pivotaltracker.com/story/show/#{story.id}"
       puts "Creating #{type} branch for #{story_name}"
 
-      GitRepository.
-        new(Dir.pwd).
+      GitService.
+        new(repository: GitFlower::GitRepository.new(Dir.pwd)).
         start_branch(name: story_name, id: story.id, type: type)
     end
 

data/lib/git_flower/version.rb

@@ -1,3 +1,3 @@
 module GitFlower
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_flower
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Wilkinson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +194,7 @@ files:
 - lib/git_flower/feature-cli.rb
 - lib/git_flower/feature.rb
 - lib/git_flower/git_repository.rb
+- lib/git_flower/git_service.rb
 - lib/git_flower/hotfix-cli.rb
 - lib/git_flower/hotfix.rb
 - lib/git_flower/pivotal_project.rb