hangover 0.0.5 → 0.0.6

data/bin/hangover

@@ -1,11 +1,31 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/hangover')
+require 'optparse'
+
+command = ARGV.shift
+ARGV.unshift('-h') if command == '-h'
+options = {}
 
-command = ARGV.first
+if command == 'git'
+  options[:args] = ARGV.join(' ')
+else
+  OptionParser.new do |opts|
+    opts.banner = "Usage: hangover <command> [options]"
+    opts.on("-d", "--debug", "Generate debug output on $stderr") do |d|
+      $HANGOVER_DEBUG = true
+    end
+    opts.on("-h", "--help", "Display this help screen") do
+      puts opts
+      exit
+    end
+  end.parse!
+end
+
+# require after options have been parsed to respect $HANGOVER_DEBUG
+require File.expand_path(File.dirname(__FILE__) + '/../lib/hangover')
 
 begin
-  Hangover.new(`pwd`.chomp).__send__(command)
+  Hangover.new(`pwd`.chomp).__send__(command, options)
 #rescue => e
 #  $stderr.puts "ERROR: #{e.message}"
 #  exit(1)

data/lib/hangover/repository.rb

@@ -24,17 +24,19 @@ class Repository
   end
   
   def exists!
-    return if File.exists?(@repository)
+    if File.directory?(@repository)
+      Hangover.logger.warn "Repository already exists at #{@repository}"
+      return
+    end
     
-    # TODO: get name of repo from repo dir
-    p "Initializing new hangover repo at #{@repository}"
+    Hangover.logger.info "Initializing new hangover repo at #{@repository}"
     init
     File.open("#{@repository}/info/exclude", "w") do |f|
       f.puts NAME
       f.puts ".git"
     end
-    add
-    commit_a("Initial commit")
+    add_all
+    commit_all("Initial commit")
   end
   
   def gitk
@@ -42,30 +44,31 @@ class Repository
   end
   
   def init
-    `git init`
+    git 'init'
   end
   
-  def add
-    `git add .`
+  def add_all
+    git 'add .'
   end
 
   def commit(message, args = '')
-    `git commit #{args} -m "#{message}"`
+    git "commit #{args} -m \"#{message}\""
   end
   
-  def commit_a(message)
+  def commit_all(message)
     commit(message, '-a')
   end
   
   def diff
-    `git diff --unified=0`
+    git 'diff --unified=0'
   end
 
   def clean
-    `git clean`
+    git 'clean'
   end
   
-  def git(args_string)
-    `git #{args_string}`
+  def git(args)
+    Hangover.logger.debug { "git #{args}" }
+    `git #{args}`
   end
 end

data/lib/hangover/version.rb

@@ -1,3 +1,3 @@
 module Hangover
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/hangover.rb

@@ -1,5 +1,6 @@
 require 'rb-fsevent'
 require 'active_support/core_ext'
+require 'logger'
 
 $:.push(File.expand_path(File.dirname(__FILE__)))
 
@@ -10,13 +11,17 @@ require 'hangover/watch_dir'
 
 class Hangover
   
+  cattr_accessor :logger
+  @@logger = Logger.new($stderr)
+  @@logger.level = $HANGOVER_DEBUG ? Logger::DEBUG : Logger::INFO
+  
   def initialize(base_dir)
     @base_dir = expand_dir(base_dir)
   end
   
-  def start
+  def start(options)
     exit_if_running!
-    $stderr.puts "Hangover starting..."
+    logger.info "Hangover starting..."
     daemonize!
     
     WatchDir.new(@base_dir).on_change do |dir|
@@ -29,41 +34,40 @@ class Hangover
       tokenizer = DiffTokenizer.new(diff)
       
       message = CommitMessageBuilder.new(tokenizer.top_adds, tokenizer.top_subs).message
-      repository.add
-      repository.commit_a(message)
+      repository.add_all
+      repository.commit_all(message)
     end
   end
   
-  def stop
+  def stop(options)
     if running?
       Process.kill(15, pid)
-      $stderr.puts "Hangover stopped."
+      logger.info "Hangover stopped."
     else
-      $stderr.puts "Hangover not running."
+      logger.info "Hangover not running."
     end
   ensure
     remove_pid if File.exist?(pid_file)
   end
   
-  def create
+  def create(options)
     Repository.new(@base_dir).exists!
   end
   
-  def gitk
+  def gitk(options)
     Repository.new(@base_dir).gitk
   end
   
-  def status
+  def status(options)
     if running?
-      $stderr.puts "Hangover is running and watching #{@base_dir}"
+      logger.info "Hangover is running and watching #{@base_dir}"
     else
-      $stderr.puts "Hangover NOT running."
+      logger.info "Hangover NOT running."
     end
   end
   
-  def git(*args)
-    args_string = args.join(' ')
-    $stderr.puts Repository.new(@base_dir).git(args_string)
+  def git(options)
+    logger.info Repository.new(@base_dir).git(options[:args])
   end
   
   private
@@ -96,7 +100,7 @@ class Hangover
       Process.kill(0, pid) == 1 if pid
     rescue Errno::ESRCH
       if File.exist?(pid_file)
-        $stderr.puts "Removing stale pid file."
+        logger.info "Removing stale pid file."
         remove_pid
       end
       false
@@ -105,7 +109,7 @@ class Hangover
     def exit_if_running!
       return unless running?
 
-      $stderr.puts "Hangover already running."
+      logger.info "Hangover already running."
       exit(0)
     end
     
@@ -113,4 +117,8 @@ class Hangover
       Process.daemon(true, true)
       write_pid
     end
+    
+    def logger
+      self.class.logger
+    end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Norman Timmler