dev_flow 0.1.0 → 0.1.1

data/bin/dw

@@ -75,6 +75,7 @@ unless command == 'init'
   end
 end
 
+# release is just a alias of command close buth with a option flag set
 if command == 'release'
   options[:release] = true
   command = 'close'

data/lib/dev_flow/app.rb

@@ -28,6 +28,14 @@ module DevFlow
         @config = @config.merge(YAML.load(File.open(@config[:local_config], 'r:utf-8').read)) 
       end
       
+      # load roadmap into variable @roadmap
+      load_roadmap
+
+      # suggest user to take those tasks
+      @waiting = Hash.new
+    end
+
+    def load_roadmap
       # load roadmap, reload config 
       if @config[:roadmap] and File.exists? (@config[:roadmap])
         info "Load roadmap from #{@config[:roadmap]}"
@@ -47,9 +55,6 @@ module DevFlow
       if @config["whoami"]
         error "You (#{user_name}) are not in the known member list. You may use 'dw init' to setup the working environment." unless all_member_names.include? @config["whoami"]
       end
-
-      # suggest user to take those tasks
-      @waiting = Hash.new
     end
 
     # log message handler
@@ -195,6 +200,7 @@ module DevFlow
       if @config["git_remote"]
         info "Rebase you working directory from #{@config["git_remote"]}/devleop"
         @git.rebase! @config["git_remote"], 'develop'
+        load_roadmap # load roadmap again
       else
         info "Git remote not defined, skip rebase."
       end
@@ -227,7 +233,10 @@ module DevFlow
       unless (is_complete or current_branch == 'develop')
         switch_to! current_branch
         `git merge develop`
-        `git push #{@config[:git_remote]} #{current_branch}` if @config[:git_remote]
+        if @config[:git_remote]
+          `git push #{@config[:git_remote]} #{current_branch}`
+          ask_rebase true # force rebase from git remote
+        end
       end
     end
 

data/lib/dev_flow/commands/init.rb

@@ -34,7 +34,7 @@ module DevFlow
       ans = STDIN.gets.chomp!
       ans = sugguest unless ans.size > 0
       error "Unknown member! Can not continue." unless all_member_names.include? ans
-      error "You are not in the team, you should not edit the files under this project" unless @roadmap.team_member_names.include? ans
+      error "You are not in the team, you should not edit the files under this project." unless @roadmap.team_member_names.include? ans
 
       # find the default git remote server
       @config["whoami"] = ans
@@ -52,7 +52,7 @@ module DevFlow
 
       ans2 = STDIN.gets.chomp!
       ans2 = suggest unless ans2.size > 0
-      error "You must define a valid git remote server" unless remotes.include? ans2
+      error "You must define a valid git remote server." unless remotes.include? ans2
 
       # write out to the local configuration file
       info "write contents to local configuration file"

data/lib/dev_flow/girc.rb

@@ -115,7 +115,7 @@ module DevFlow
 
     def stash!
       unless wd_clean?
-        info "Save you change to stash"
+        info "Stash your local changes"
         `#{@git} add .`
         `#{@git} stash`
       end
@@ -131,8 +131,8 @@ module DevFlow
     def rebase! remote = 'origin', branch = 'develop'
       cb = self.current_branch
       stashed = false
+
       unless self.wd_clean?
-        info "Stash your local changes"
         self.stash!
         stashed = true
       end
@@ -142,21 +142,24 @@ module DevFlow
         # `#{@git} pull --rebase #{remote} #{branch}`
         `#{@git} pull #{remote} #{branch}`
       else
-        info "pull branch #{self.current_branch} from remote"
-        `#{@git} pull #{remote} #{self.current_branch}`
         info "Switch to branch #{branch}"
         `#{@git} fetch #{remote}`
         rslt = `#{@git} checkout #{branch}`
         raise "Checkout failed: #{rslt}" unless $?.success?
+        
         info "Update branch from remote"
         # rslt = `#{@git} pull --rebase #{remote} #{branch}`
         rslt = `#{@git} pull #{remote} #{branch}`
         raise "Pull for #{branch} failed: #{rslt}" unless $?.success?
+        
         info "Switch back to branch #{cb}"
         `#{@git} checkout #{cb}`
         info "Merge from #{branch}"
         rslt = `#{@git} merge #{branch}`
         raise "Merge with #{branch} failed: #{rslt}" unless $?.success?
+
+        info "pull branch #{self.current_branch} from remote"
+        `#{@git} pull #{remote} #{self.current_branch}`
       end
 
       self.stash_pop! if stashed

data/lib/dev_flow/version.rb

@@ -1,3 +1,3 @@
 module DevFlow
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/dev_flow.rb

@@ -19,6 +19,7 @@ require 'dev_flow/girc'
 
 module DevFlow
   def self.invoke! config, command
+    # autoload command required files
     require "dev_flow/commands/#{command}"
     klass = command.to_s.capitalize
     eval(klass).new(config, command).process!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_flow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: