flit 0.1.pre → 0.2.pre

data/History.txt

@@ -1,2 +1,7 @@
-== 0.1.dev / 2010-08-27
+== 0.2.pre / 2010-08-29
+  * Feature: Added delete, finish and list commands
+  * Feature: Commands can now have their own help pages. Accessible via 'flit help COMMAND'
+  * Bugfix: Commands are no longer initialised when loading their help docs
+
+== 0.1.pre / 2010-08-27
   * Developer preview

data/VERSION

@@ -1 +1 @@
-0.1.pre
+0.2.pre

data/lib/flit.rb

@@ -10,10 +10,12 @@ module Flit
   
   module Commands
     autoload :Base,     "flit/commands"
+    autoload :Delete,   "flit/commands/delete"
+    autoload :Finish,   "flit/commands/finish"
     autoload :Init,     "flit/commands/init"
+    autoload :List,     "flit/commands/list"
     autoload :Start,    "flit/commands/start"
     autoload :Stop,     "flit/commands/stop"
-    autoload :Finish,   "flit/commands/finish"
     autoload :Version,  "flit/commands/version"
   end
   
@@ -23,7 +25,7 @@ module Flit
       puts "Flit #{Version::STRING}"
       
     elsif ARGV[0].nil? || %w(help --help -h).include?(ARGV.first)
-      puts Help.display
+      puts (ARGV[1].nil?) ? Help.display : Help.display_for_command(ARGV[1])
       
     else
       command = ARGV.first

data/lib/flit/commands/delete.rb

@@ -0,0 +1,28 @@
+module Flit
+  module Commands
+    class Delete
+      DESC = "Delete a feature or bugfix branch. Use with caution."
+      USAGE = "TYPE NAME"
+      OPTIONS = {
+        :type => "Can be either a feature or bugfix",
+        :name => "The name of your feature or bugfix",
+      }
+      
+      def run(args)
+        # Gatekeepers
+        fatal "directory isn't a flit repository" unless is_flit?
+        show_help unless args.count == 2
+        
+        type, name = args
+        config = open_config
+        
+        h = HighLine.new
+        
+        if h.agree("Delete #{type} branch '#{name}'? [yn]", true)
+          `git branch -d #{type}/#{name}`
+        end
+      end
+      
+    end
+  end
+end

data/lib/flit/commands/finish.rb

@@ -2,11 +2,41 @@ module Flit
   module Commands
     class Finish
       DESC = "Finish up a feature or bugfix and merge it back into the development branch"
+      USAGE = "TYPE NAME"
+      OPTIONS = {
+        :type => "Can be either a feature or bugfix",
+        :name => "The name of your feature or bugfix",
+      }
       
       def run(args)
-        # TODO: Show the help page if no options are set
+        # Gatekeepers
+        fatal "directory isn't a flit repository" unless is_flit?
+        show_help unless args.count == 2
         
-        puts "flit: not implemented yet"
+        type, name = args
+        config = open_config
+        
+        current_branch = nil
+        `git branch`.split("\n").each do |branch|
+          if branch[0,1] == '*'
+            current_branch = branch[2..-1].downcase.split('/')
+          end
+        end
+        
+        `git checkout #{config[:branches][:bleeding_edge]}` unless current_branch[0] == config[:branches][:bleeding_edge]
+        `git pull`
+        `git checkout #{type}/#{name}`
+        `git merge master`
+        
+        # Todo: do merge conflict detection here
+        
+        `git checkout #{config[:branches][:bleeding_edge]}`
+        `git merge #{type}/#{name}`
+        
+        `flit delete #{type} #{name}`
+        
+        puts "\nMerged '#{type}/#{name}' into '#{config[:branches][:bleeding_edge]}'."
+        puts "You should now 'git push' your changes."
       end
       
     end

data/lib/flit/commands/init.rb

@@ -1,7 +1,7 @@
 module Flit
   module Commands
     class Init
-      DESC = "Create a new Flit repository"
+      DESC = "Create a new Flit repository. Must be run from the top level directory in your Git repository."
       
       def run
         # Don't allow us to reinitialise an existing Flit repository

data/lib/flit/commands/list.rb

@@ -0,0 +1,55 @@
+module Flit
+  module Commands
+    class List
+      DESC = "Allows you to view an outline of ongoing features and bugfixes in your Git repo.
+If TYPE is not specified, 'list' will show you details of both features and bugfixes."
+      USAGE = "[TYPE]"
+      OPTIONS = {
+        :type => "Can be either a feature or bugfix",
+      }
+      
+      def run(args)
+        # Gatekeeper
+        fatal "directory isn't a flit repository" unless is_flit?
+        
+        type = args[0]
+        unless type.nil? || type == 'feature' || type == 'bugfix'
+          show_help
+        end
+        
+        config = open_config
+        feature_branches = []
+        bugfix_branches = []
+        other_branches = []
+        
+        `git branch`.each do |branch|
+          indicator = (branch[0,1] == '*') ? '  => ' : '     '
+          branch = branch[2..-1].downcase
+          split_branch = branch.split('/')
+          
+          if branch.include?(config[:branches][:feature_prefix])
+            feature_branches << "#{indicator}#{split_branch[1..-1].join('/')}"
+          elsif branch.include?(config[:branches][:bugfix_prefix])
+            bugfix_branches << "#{indicator}#{split_branch[1..-1].join('/')}"
+          else
+            other_branches << "#{indicator}#{branch}"
+          end
+        end
+        
+        list_branches "Features", feature_branches unless type == 'bugfix'
+        list_branches "Bugfixes", bugfix_branches unless type == 'feature'
+        list_branches "Other", other_branches if type.nil?
+      end
+      
+      private
+      def list_branches(type, branches)
+        if branches.count > 0
+          puts "#{type}:"
+          branches.each {|f| puts f}
+          puts ""
+        end
+      end
+      
+    end
+  end
+end

data/lib/flit/commands/stop.rb

@@ -1,11 +1,9 @@
 module Flit
   module Commands
     class Stop
-      DESC = "Stop work on a feature of bugfix"
+      DESC = "Stop work on a feature or bugfix"
       
       def run(args)
-        # TODO: Show the help page if no options are set
-        
         `git checkout #{open_config[:branches][:bleeding_edge]}`
       end
       

data/lib/flit/help.rb

@@ -7,7 +7,7 @@ Usage:
 Commands:
   {{commands}}
   
-  help                # Show this page
+  help [COMMAND]      # Show this page
   -v, --version       # Get Flit version information
 
 USAGE
@@ -26,7 +26,8 @@ USAGE
           begin
             command = f.gsub(/\.rb/, '')
             klass = "Flit::Commands::#{command.camelize}"
-            commands << "#{command.ljust(20)}# #{ eval("#{klass}::DESC") }"
+            desc = eval("#{klass}::DESC").split('.')[0]
+            commands << "#{command.ljust(20)}# #{desc}"
           rescue
           end
         end
@@ -37,9 +38,21 @@ USAGE
     
     
     def self.display_for_command(klass)
+      if klass.split(/::/).count == 1
+        klass = "Flit::Commands::#{klass.camelize}"
+      end
+      
       command = klass.split(/::/)[-1].downcase
+      help = ""
+      
+      begin
+        help << "#{eval("#{klass}::DESC")}\n\n"
+      rescue
+        puts "flit: '#{command}' is not a command. See 'flit help'."
+        exit(0)
+      end
       
-      help = "Usage:\n  flit #{command}"
+      help << "Usage:\n  flit #{command}"
       begin
         help << " #{eval("#{klass}::USAGE")}"
       rescue

data/lib/flit/version.rb

@@ -1,5 +1,5 @@
 module Flit
   module Version
-    STRING = "0.1.dev"
+    STRING = "0.2.pre"
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: true
   segments: 
   - 0
-  - 1
+  - 2
   - pre
-  version: 0.1.pre
+  version: 0.2.pre
 platform: ruby
 authors: 
 - Matt Kirman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +01:00
+date: 2010-08-29 00:00:00 +01:00
 default_executable: flit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,8 +49,10 @@ files:
 - lib/flit/commands.rb
 - lib/flit/help.rb
 - lib/flit/version.rb
+- lib/flit/commands/delete.rb
 - lib/flit/commands/finish.rb
 - lib/flit/commands/init.rb
+- lib/flit/commands/list.rb
 - lib/flit/commands/start.rb
 - lib/flit/commands/stop.rb
 - lib/flit/commands/version.rb