flit 0.2.pre → 0.3.pre

data/History.txt

@@ -1,3 +1,6 @@
+== master
+  * Bugfix: Fixed broken 'list' command
+
 == 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'

data/README.md

@@ -1,6 +1,6 @@
 #Flit
 
-Flit contains super simple branch management extensions for Git. It aims to give quick repository functions to improve a typical Git workflow as described at [http://mattkirman.com/2010/08/27/my-git-workflow-introducing-flit/](http://mattkirman.com/2010/08/27/my-git-workflow-introducing-flit/).
+Flit is a super simple extension manager for Git. It aims to give quick repository functions to improve a typical Git workflow as described at [http://mattkirman.com/2010/08/27/my-git-workflow-introducing-flit/](http://mattkirman.com/2010/08/27/my-git-workflow-introducing-flit/) through a combination of [events](http://github.com/mattkirman/flit/wiki/Events), [commands](http://github.com/mattkirman/flit/wiki/Commands) and [plugins](http://github.com/mattkirman/flit/wiki/Plugins).
 
 _Flit is an extremely early alpha. Features may be broken or just plain missing, but getting this code out into the open-source community where people can start hacking away with it is much more important. If something’s missing just fork the code, add your fix and send me a pull request._
 
@@ -44,6 +44,11 @@ Once your code is finished and you're ready to merge it back into your developme
 This will pull down changes in master, rebase them into your feature branch and then merge your feature back into master.
 
 
+##Documentation
+
+Please refer to the [Flit wiki](http://github.com/mattkirman/flit/wiki) for full documentation. As with the rest of the project, the documentation is a work in progress so what's written may differ slightly from what's actually on the ground.
+
+
 ##Contributing
 
 You want to contribute? Great!

data/VERSION

@@ -1 +1 @@
-0.2.pre
+0.3.pre

data/lib/flit.rb

@@ -5,6 +5,7 @@ require 'highline'
 
 module Flit
   autoload :Help,     'flit/help'
+  autoload :Hooks,    'flit/hooks'
   autoload :Version,  'flit/version'
   
   
@@ -21,11 +22,15 @@ module Flit
   
   
   def self.exec_script!
+    Hooks.instance.load!
+    Hooks.fire :didStart
+    
     if %w(--version -v).include? ARGV.first
       puts "Flit #{Version::STRING}"
       
     elsif ARGV[0].nil? || %w(help --help -h).include?(ARGV.first)
       puts (ARGV[1].nil?) ? Help.display : Help.display_for_command(ARGV[1])
+      Hooks.fire :didShowHelp
       
     else
       command = ARGV.first
@@ -43,6 +48,8 @@ module Flit
       end
       
     end
+    
+    Hooks.fire :didFinish
   end
   
 end

data/lib/flit/commands.rb

@@ -14,7 +14,7 @@ module Flit
       
       
       def is_flit?(path = nil)
-        path ||= "#{working_directory}/.flit_config"
+        path ||= "#{working_directory}/.flit/config"
         File.exists? path
       end
       
@@ -31,7 +31,7 @@ module Flit
       
       
       def open_config
-        YAML::load(File.open('.flit_config'))
+        YAML::load(File.open('.flit/config'))
       end
       
       

data/lib/flit/commands/delete.rb

@@ -13,6 +13,8 @@ module Flit
         fatal "directory isn't a flit repository" unless is_flit?
         show_help unless args.count == 2
         
+        Hooks.fire :didStartCommand__delete
+        
         type, name = args
         config = open_config
         
@@ -21,6 +23,8 @@ module Flit
         if h.agree("Delete #{type} branch '#{name}'? [yn]", true)
           `git branch -d #{type}/#{name}`
         end
+        
+        Hooks.fire :didFinishCommand__delete, {:type => type, :name => name}
       end
       
     end

data/lib/flit/commands/finish.rb

@@ -13,6 +13,8 @@ module Flit
         fatal "directory isn't a flit repository" unless is_flit?
         show_help unless args.count == 2
         
+        Hooks.fire :didStartCommand__finish
+        
         type, name = args
         config = open_config
         
@@ -37,6 +39,8 @@ module Flit
         
         puts "\nMerged '#{type}/#{name}' into '#{config[:branches][:bleeding_edge]}'."
         puts "You should now 'git push' your changes."
+        
+        Hooks.fire :didFinishCommand__finish, {:type => type, :name => name}
       end
       
     end

data/lib/flit/commands/init.rb

@@ -9,6 +9,8 @@ module Flit
           fatal "directory is already a flit repository"
         end
         
+        Hooks.fire :didStartCommand__init
+        
         # Don't allow us to reinitialise an existing Git repository
         unless is_git?
           puts "Creating a new repository..."
@@ -33,6 +35,7 @@ module Flit
         
         
         # Save our config
+        `mkdir -p .flit .flit/hooks`
         save_config ({
           :branches => {
             :bleeding_edge => bleeding_edge_branch_name,
@@ -47,6 +50,7 @@ module Flit
         })
         
         # Repository created!
+        Hooks.fire :didFinishCommand__init
       end
       
     end

data/lib/flit/commands/list.rb

@@ -12,6 +12,8 @@ If TYPE is not specified, 'list' will show you details of both features and bugf
         # Gatekeeper
         fatal "directory isn't a flit repository" unless is_flit?
         
+        Hooks.fire :didStartCommand__list
+        
         type = args[0]
         unless type.nil? || type == 'feature' || type == 'bugfix'
           show_help
@@ -22,7 +24,7 @@ If TYPE is not specified, 'list' will show you details of both features and bugf
         bugfix_branches = []
         other_branches = []
         
-        `git branch`.each do |branch|
+        `git branch`.split("\n").each do |branch|
           indicator = (branch[0,1] == '*') ? '  => ' : '     '
           branch = branch[2..-1].downcase
           split_branch = branch.split('/')
@@ -39,6 +41,8 @@ If TYPE is not specified, 'list' will show you details of both features and bugf
         list_branches "Features", feature_branches unless type == 'bugfix'
         list_branches "Bugfixes", bugfix_branches unless type == 'feature'
         list_branches "Other", other_branches if type.nil?
+        
+        Hooks.fire :didFinishCommand__list
       end
       
       private

data/lib/flit/commands/start.rb

@@ -13,6 +13,8 @@ module Flit
         fatal "directory isn't a flit repository" unless is_flit?
         show_help unless args.count == 2
         
+        Hooks.fire :didStartCommand__start
+        
         type, name = args
         config = open_config
         
@@ -26,6 +28,8 @@ module Flit
         
         `git branch #{branch_name}` if `git branch`.match(branch_name).nil?
         `git checkout #{branch_name}`
+        
+        Hooks.fire :didFinishCommand__start, {:type => type, :name => name}
       end
       
     end

data/lib/flit/commands/stop.rb

@@ -4,7 +4,9 @@ module Flit
       DESC = "Stop work on a feature or bugfix"
       
       def run(args)
+        Hooks.fire :didStartCommand__stop
         `git checkout #{open_config[:branches][:bleeding_edge]}`
+        Hooks.fire :didFinishCommand__stop
       end
       
     end

data/lib/flit/hooks.rb

@@ -0,0 +1,58 @@
+require 'singleton'
+
+module Flit
+  class Hooks
+    include Singleton
+    
+    @hooks = {}
+    
+    def load!
+      # Load hooks on a per-repository basis
+      Dir[File.join(`pwd`.gsub(/\n/, ''), '.flit', 'hooks', '*.rb')].each do |file|
+        load_file file
+      end
+      
+      # Load hooks in the user's home directory
+      Dir[File.join(`cd ~ && pwd`.gsub(/\n/, ''), '.flit', 'hooks', '*.rb')].each do |file|
+        load_file file
+      end
+    end
+    
+    def bind(*args, &block)
+      args = parse_args args
+      @hooks = {} if @hooks.nil?
+      
+      @hooks[args[:on]] = [] if @hooks[args[:on]].nil?
+      @hooks[args[:on]] << block
+    end
+    
+    def fire(e, args = {})
+      unless @hooks[e].nil?
+        @hooks[e].each do |hook|
+          hook.call args
+        end
+      end
+    end
+    
+    def self.fire(e, args = {})
+      instance.fire e, args
+    end
+    
+    private
+    def load_file(file)
+      hook = File.open(file, 'r').read
+      instance_eval(hook, file || "(eval)")
+    end
+    
+    def parse_args(args)
+      arguments = {}
+      args.each do |a|
+        a.each do |c, d|
+          arguments[c] = d
+        end
+      end
+      arguments
+    end
+    
+  end
+end

data/lib/flit/version.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: true
   segments: 
   - 0
-  - 2
+  - 3
   - pre
-  version: 0.2.pre
+  version: 0.3.pre
 platform: ruby
 authors: 
 - Matt Kirman
@@ -30,7 +30,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Flit contains super simple branch management extensions for Git. It aims to give quick repository functions to improve a typical Git workflow.
+description: Flit is a super simple extension manager for Git. It aims to give quick repository functions to improve a typical Git workflow.
 email: matt@mattkirman.com
 executables: 
 - flit
@@ -48,6 +48,7 @@ files:
 - lib/flit/cli.rb
 - lib/flit/commands.rb
 - lib/flit/help.rb
+- lib/flit/hooks.rb
 - lib/flit/version.rb
 - lib/flit/commands/delete.rb
 - lib/flit/commands/finish.rb
@@ -93,6 +94,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Branch management extensions for Git
+summary: Git extension manager
 test_files: []