dev_flow 0.0.7 → 0.0.8

data/bin/dw

@@ -23,8 +23,7 @@ optparse = OptionParser.new do |opts|
     options[:local_config] = lc
   end
 
-  options[:members_file] = 'members.yml' if File.exists?('members.yml')
-  options[:members_file] = 'config/members.yml' if File.exists?('config/members.yml')
+  options[:members_file] = 'members.yml'
   opts.on('-m MEMBERS_FILE', '--members_file MEMBERS_FILE', 'use an other members file') do |mf|
     options[:members_file] = mf
     raise "the specified members file #{mf} is not exists." unless File.exists? mf

data/lib/dev_flow/commands/complete.rb

@@ -24,7 +24,7 @@ module DevFlow
 
       # commit you current branch and push
       progress = 99
-      message = ARGV[2] || "complete your branch by set progress to 99."
+      message = ARGV[2] || "complete the branch by set progress to 99."
       message = "[complete] " + message
 
       info "Commit your progress"

data/lib/dev_flow/girc.rb

@@ -132,6 +132,7 @@ module DevFlow
       cb = self.current_branch
       stashed = false
       unless self.wd_clean?
+        info "Stash your local changes"
         self.stash!
         stashed = true
       end
@@ -148,12 +149,12 @@ module DevFlow
         info "Update branch from remote"
         # rslt = `#{@git} pull --rebase #{remote} #{branch}`
         rslt = `#{@git} pull #{remote} #{branch}`
-        raise "Rebase pull for #{branch} failed: #{rslt}" unless $?.success?
+        raise "Pull for #{branch} failed: #{rslt}" unless $?.success?
         info "Switch back to branch #{cb}"
         `#{@git} checkout #{cb}`
-        info "Rebase from #{branch}"
-        rslt = `#{@git} rebase #{branch}`
-        raise "Rebase with #{branch} failed: #{rslt}" unless $?.success?
+        info "Merge from #{branch}"
+        rslt = `#{@git} merge #{branch}`
+        raise "Merge with #{branch} failed: #{rslt}" unless $?.success?
       end
 
       self.stash_pop! if stashed

data/lib/dev_flow/version.rb

@@ -1,3 +1,3 @@
 module DevFlow
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_flow
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -52,7 +52,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- ROADMAP
 - Rakefile
 - bin/dw
 - dev_flow.gemspec
@@ -107,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: a bundle of tools for ROADMAP/git based development flow control.

data/ROADMAP

@@ -1,15 +0,0 @@
-ROADMAP for dev_flow Development
-==================================
-
-% -----
-title: dev_flow development tools
-status: producing
-members:
-  huangw: [Huang Wei, "huangw@pe-po.com"]
-leader: huangw
-year: 2013
-% -----
-
-[+] release_v0.3: with version number handling 03/25 @huangw:03/25
-[+] hotfix_taginfo: put tag situation on info screen 03/25 @huangw:03/25
-[+] release_v0.4: with cleanup closed local task branches 03/25 @huangw:03/25