blindgaenger-glitter 0.1.0 → 0.2.0

data/.gitignore

@@ -0,0 +1 @@
+pkg/

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/glitter

@@ -1,53 +1,5 @@
-#!/usr/bin/ruby
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + '/../lib')
-
+#!/usr/bin/env ruby
 require 'rubygems'
-require 'ostruct'
-require 'yaml'
-require 'highline/import'
-require 'ftools'
-require 'gli'
-require 'twitter'
-require 'twitter_app'
-
-include GLI
-
-CONFIG_FILE = "~/.twitter/glitter.yml"
-
-Dir['lib/commands/*.rb'].each {|file| load file}
-
-pre do |global_options,command,options,args|
-  @config = TwitterConfig.new(CONFIG_FILE)
-
-  if command.nil?
-    commands[:help].execute(global_options,options,args)
-    false
-  elsif command && command.name == :help
-    true # always help
-  elsif @config.atoken.nil?
-    if command && command.name == :init
-      true
-    else
-      puts "Sorry, but you need to initialize first. Try this:"
-      puts "\n"
-      puts "    $ glitter init"
-      puts "\n"
-      false
-    end
-  else
-    @twitter = TwitterApp.new(@config)
-    true # already init
-  end
-end
-
-post do |global_options,command,options,args|
-end
-
-on_error do |ex|
-  warn ex.message
-  warn ex.backtrace
-  true
-end
-
+require 'glitter'
 GLI.run(ARGV)
-
+ 

data/glitter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{glitter}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["blindgaenger"]
-  s.date = %q{2009-07-27}
+  s.date = %q{2009-07-28}
   s.default_executable = %q{glitter}
   s.email = %q{blindgaenger@gmail.com}
   s.executables = ["glitter"]
@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
      "glitter.rdoc"
   ]
   s.files = [
-    "LICENSE",
+    ".gitignore",
+     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/commands/init.rb",
      "lib/commands/log.rb",
      "lib/glitter.rb",
+     "lib/template.rb",
      "lib/twitter_app.rb",
      "test/glitter_test.rb",
      "test/test_helper.rb"

data/lib/commands/commit.rb

@@ -4,7 +4,7 @@ command :commit do |c|
   c.desc "The text of your status update. Statuses over 140 characters will be forceably truncated."
   c.flag :message, :m
 
-  c.action do |global, options, args|
+  c.action do |globals, options, args|
     unless options.message
       say "Aborting commit due to empty commit message."
     else

data/lib/commands/init.rb

@@ -1,7 +1,7 @@
 desc "Registers glitter with your twitter account"
 command [:init] do |c|
 
-  c.action do |global, options, args|
+  c.action do |globals, options, args|
     #TODO: check for global --force option, not a git parameter but useful
     if @config.atoken
       puts "You already initialized glitter. Find out what else you can do:"

data/lib/commands/log.rb

@@ -5,31 +5,26 @@ command :log do |c|
   c.default_value 20
   c.flag :n, :'max-count'
 
-  c.action do |globals, options, args|
-    def bold(text)
-      "<%= color('#{text}', BOLD) %>"
-    end
-
-    def color(text, color)
-      "<%= color('#{text}', :#{color.to_s}) %>"
-    end
+  c.desc "Show colored diff."
+  c.switch :color
   
-    def indent(text, length=4)
-      ' '*length + wrap(text, length, 80)
-    end
+  c.desc "Turn off colored diff."
+  c.switch :"no-color"
 
-    statuses = @twitter.friends_timeline({:count => options['max-count']})
-    statuses.each {|status|
-      say <<-EOL
+  c.action do |globals, options, args|
+    template = Template.new(options) do |status|
+    <<-EOL
 #{color "commit #{status.id}", :yellow}
 Author: #{status.user.screen_name} <#{status.user.name}>
 Date:   #{status.created_at}
 
 #{indent(status.text)}
 
-    EOL
-    }
+EOL
+    end
 
+    statuses = @twitter.friends_timeline({:count => options.n})
+    template.print_each statuses
   end
 end
 

data/lib/glitter.rb

@@ -0,0 +1,53 @@
+$:.unshift File.dirname(__FILE__)
+%w[rubygems ostruct yaml highline/import ftools gli twitter].each { |f| require f }
+RUBY_PLATFORM = PLATFORM unless defined? RUBY_PLATFORM # Ruby 1.8 compatibility
+ 
+require 'twitter_app'
+load 'lib/template.rb'
+include GLI
+Dir['lib/commands/*.rb'].each {|file| load file}
+
+CONFIG_FILE = "~/.twitter/glitter.yml"
+
+desc 'Show the current version'
+switch :version
+
+pre do |globals,command,options,args|
+  @config = TwitterConfig.new(CONFIG_FILE)
+
+  if command.nil?
+    if globals.version
+      puts "glitter version #{File.read 'VERSION'}"
+    else
+      commands[:help].execute(globals,options,args)
+    end
+    false
+  elsif command && command.name == :help
+    true # always help
+  elsif @config.atoken.nil?
+    if command && command.name == :init
+      true
+    else
+      puts "Sorry, but you need to initialize first. Try this:"
+      puts "\n"
+      puts "    $ glitter init"
+      puts "\n"
+      false
+    end
+  else
+    @twitter = TwitterApp.new(@config)
+    true # already init
+  end
+end
+
+post do |globals,command,options,args|
+end
+
+on_error do |ex|
+  puts ex.message
+  puts ex.backtrace.join("\n")
+  true
+end
+
+GLI.run(ARGV) if __FILE__ == $0
+

data/lib/template.rb

@@ -0,0 +1,52 @@
+class Object
+  module InstanceExecHelper; end
+  include InstanceExecHelper
+  def instance_exec(*args, &block)
+    begin
+      old_critical, Thread.critical = Thread.critical, true
+      n = 0
+      n += 1 while respond_to?(mname="__instance_exec#{n}")
+      InstanceExecHelper.module_eval{ define_method(mname, &block) }
+    ensure
+      Thread.critical = old_critical
+    end
+    begin
+      ret = send(mname, *args)
+    ensure
+      InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
+    end
+    ret
+  end
+end
+
+
+class Template
+  def initialize(globals, &block)
+    @color = !globals['no-color']
+    @block = block
+  end
+
+  def print(args)
+    say instance_exec(args, &@block)
+  end
+  
+  def print_each(list)
+    list.each {|item|
+      print item
+    }
+  end
+
+  def bold(text)
+    return text unless @color
+    "<%= color('#{text}', BOLD) %>"
+  end
+
+  def color(text, color)
+    return text unless @color
+    "<%= color('#{text}', :#{color.to_s}) %>"
+  end
+
+  def indent(text, length=4)
+    ' '*length + wrap(text, length, 80)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blindgaenger-glitter
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - blindgaenger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-07-28 00:00:00 -07:00
 default_executable: glitter
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,7 @@ extra_rdoc_files:
 - README.rdoc
 - glitter.rdoc
 files: 
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -55,6 +56,7 @@ files:
 - lib/commands/init.rb
 - lib/commands/log.rb
 - lib/glitter.rb
+- lib/template.rb
 - lib/twitter_app.rb
 - test/glitter_test.rb
 - test/test_helper.rb