assisted_workflow 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    assisted_workflow (0.2.0)
+    assisted_workflow (0.2.1)
       hashie (~> 2.0.5)
       octokit (~> 2.0)
       pivotal-tracker (~> 0.5.12)

data/lib/assisted_workflow/addons/git.rb

@@ -26,6 +26,7 @@ module AssistedWorkflow::Addons
     
     # run all the git steps required for a clean pull request
     def rebase_and_push
+      log "preparing local branch"
       check_everything_commited!
       branch = current_branch
       git "checkout master"
@@ -53,18 +54,22 @@ module AssistedWorkflow::Addons
     end
     
     # check if current branch is merged into master
-    def is_merged?
+    def check_merged!
       check_everything_commited!
       branch = current_branch
       git "checkout master"
       git "pull --rebase"
       merged = git("branch --merged").include?(branch)
       git "checkout #{branch}"
+      unless merged
+        raise AssistedWorkflow::Error, "this branch is not merged into master"
+      end
       merged
     end
     
     # removes current branch and its remote version
     def remove_branch
+      log "removing local and remote feature branches"
       branch = current_branch
       git "push origin :#{branch}", :raise_error => false
       git "checkout master"

data/lib/assisted_workflow/version.rb

@@ -1,3 +1,3 @@
 module AssistedWorkflow
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/assisted_workflow/addons/git_spec.rb

@@ -50,7 +50,7 @@ describe AssistedWorkflow::Addons::Git do
     @git.repository.must_equal "flaviogranero/assisted_workflow"
   end
   
-  describe "#is_merged?" do
+  describe "#check_merged!" do
     
     before do
       mock(@git).system("git status --porcelain"){ "" }
@@ -61,12 +61,13 @@ describe AssistedWorkflow::Addons::Git do
     
     it "returns true if current branch is merged into master" do
       mock(@git).system("git branch --merged"){ "flavio.00001.new_feature" }
-      @git.is_merged?.must_equal true
+      @git.check_merged!.must_equal true
     end
     
     it "returns false if current branch is not merged into master" do
       mock(@git).system("git branch --merged"){ "flavio.00002.other_feature" }
-      @git.is_merged?.must_equal false
+      proc { @git.check_merged! }.must_raise AssistedWorkflow::Error, "this branch is not merged into master"
+      
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assisted_workflow
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -151,7 +151,6 @@ files:
 - lib/assisted_workflow/cli.rb
 - lib/assisted_workflow/config_file.rb
 - lib/assisted_workflow/exceptions.rb
-- lib/assisted_workflow/git.rb
 - lib/assisted_workflow/output.rb
 - lib/assisted_workflow/templates/awconfig.global.tt
 - lib/assisted_workflow/templates/awconfig.local.tt
@@ -219,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -50568132931744746
+      hash: 4272922658484443950
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -50568132931744746
+      hash: 4272922658484443950
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/assisted_workflow/git.rb

@@ -1,111 +0,0 @@
-require "assisted_workflow/exceptions"
-
-module AssistedWorkflow
-  
-  class GitError < Error; end
-  
-  class Git
-    
-    DESCRIPTION_LIMIT = 30
-    
-    def initialize(output, options = {})
-      super
-      @command_options = {:raise_error => true}.merge(options)
-    end
-    
-    # creates a new git branch based on story attributes
-    # the branch name format is:
-    # => story_onwer_username.story_id.story_name
-    def create_story_branch(story)
-      log "creating the new branch"
-      branch = branch_name(story)
-      git "checkout -b #{branch}"
-      # git "push --set-upstream origin #{branch}"
-    end
-    
-    # run all the git steps required for a clean pull request
-    def rebase_and_push
-      log "preparing local branch"
-      check_everything_commited!
-      branch = current_branch
-      git "checkout master"
-      git "pull --rebase"
-      git "checkout #{branch}"
-      git "rebase master"
-      git "push -u -f origin #{branch}"
-    end
-    
-    # returns the current story id based on branch name
-    def current_story_id
-      current_branch.split(".")[1]
-    end
-    
-    # returns the current local branch name
-    def current_branch
-      git("rev-parse --abbrev-ref HEAD", :silent => true)
-    end
-    
-    # returns the repository name assigned to origin following the format:
-    # owner/project
-    def repository
-      url = git("config --get remote.origin.url", :error => "cannot find 'origin' remote repository url")
-      url.gsub("git@github.com:", "").gsub("https://github.com/", "").gsub(/\.git$/, "").chomp
-    end
-    
-    # check if current branch is merged into master
-    def check_merged!
-      check_everything_commited!
-      branch = current_branch
-      git "checkout master"
-      git "pull --rebase"
-      merged = git("branch --merged").include?(branch)
-      git "checkout #{branch}"
-      unless merged
-        raise AssistedWorkflow::Error, "this branch is not merged into master"
-      end
-    end
-    
-    # removes current branch and its remote version
-    def remove_branch
-      log "removing local and remote feature branches"
-      branch = current_branch
-      git "push origin :#{branch}", :raise_error => false
-      git "checkout master"
-      git "branch -D #{branch}"
-    end
-    
-    private
-    
-    def git(command, options = {})
-      options = @command_options.merge(options)
-      # log("git #{command}", :step => true) unless options[:silent] == true
-      result = system("git #{command}")
-      if system_error? && options[:raise_error]
-        msg = ["git command error", options[:error]].compact.join(": ")
-        raise GitError, msg
-      end
-      result
-    end
-    
-    def system(command)
-      %x{#{command}}.chomp
-    end
-    
-    def system_error?
-      $? != 0
-    end
-    
-    def branch_name(story)
-      description = story.name.to_s.downcase.gsub(/\W/, "_").slice(0, DESCRIPTION_LIMIT)
-      [story.other_id, story.id, description].join(".").downcase
-    end
-    
-    def not_commited_changes
-      git("status --porcelain", :silent => true).split("\n")
-    end
-    
-    def check_everything_commited!
-      raise AssistedWorkflow::Error, "git: there are not commited changes" unless not_commited_changes.empty?
-    end
-  end
-end