utsup 0.1.1 → 0.1.2

data/Rakefile

@@ -14,7 +14,7 @@ $hoe = Hoe.spec 'utsup' do
   self.developer 'Nick Merwin', 'nick@lemurheavy.com'
   self.post_install_message = File.read('PostInstall.txt')
   self.rubyforge_name       = self.name
-  self.extra_deps         = [['schacon-git'],['daemons']]
+  self.extra_deps         = [['schacon-git'],['daemons'],['terminal_markup']]
   # self.spec_extras[:extensions] = "extconf.rb"
   self.spec_extras[:rdoc_options] = ""
   self.spec_extras[:homepage] = %q{http://github.com/yickster/utsup_gem}

data/lib/sup.rb

@@ -8,14 +8,17 @@ require 'rubygems'
 require 'active_resource'
 require 'git'
 
+require 'terminal_markup'
+
 require 'sup/yamlize'
 
 require 'sup/differ/differ'
 require 'sup/api'
 require 'sup/command'
+require 'sup/help'
 
 module Sup
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   GIT_HOOKS = %w(post-commit post-receive post-merge post-checkout) #TODO: post-rebase?
   
   GLOBAL_CONFIG_PATH          = '~/.utsup/config.yml'
@@ -32,12 +35,14 @@ module Sup
     # ===========================
     
     def sign_in
-      puts "Enter your UtSup.com credentials. Don't have an account yet? Create one at #{SIGNUP_URL}"
+      render "Please enter your "+"UtSup?".in_magenta+" credentials. " + 
+        "Don't have an account yet? ".in_red + 
+        "Create one at ".in_green + "#{SIGNUP_URL}".in_blue.as_underline
       
       loop do
-        print "Email: "
+        print "Email: ".in_yellow.escape
         email = gets.chomp
-        print "Password: "
+        print "Password: ".in_yellow.escape
         system "stty -echo"
         password = gets.chomp
         system "stty echo"
@@ -46,7 +51,7 @@ module Sup
         if api_key = Api::User.get_api_key(email, password)
           return api_key
         else
-          puts "Couldn't find that email/password combo..."
+          render "Couldn't find that email/password combo...".in_red
         end
       end
     end
@@ -71,9 +76,11 @@ module Sup
       unless global_config['api_key']
         global_config.api_key = api_key || sign_in
         global_config.save
-        puts "Success! Added API Key to #{GLOBAL_CONFIG_PATH}\n  - Lemur Heavy Industries (http://lemurheavy.com)"
+        render "Success!".in_green+" Added API Key to #{GLOBAL_CONFIG_PATH}\n" +
+          "  - Lemur Heavy Industries ".in_yellow +
+          "http://lemurheavy.com".in_blue.as_underline
       else
-        puts "You're good to go."
+        render "You're good to go.".in_green
       end
     end
     
@@ -129,7 +136,7 @@ module Sup
       global_project_config = Yamlize.new GLOBAL_PROJECT_CONFIG_PATH
       
       unless global_config['api_key']
-        puts "You need to run 'sup setup <api_key>' first, thanks!"
+        render "You need to run 'sup setup <api_key>' first, thanks!".in_red
         exit 0
       end
       
@@ -231,12 +238,18 @@ module Sup
         :today => opts[:today]
       }
       
-      puts "----------------------------------------------------------------------------------"
-      puts "This is UtSup#{" with #{name}" if name}:\n"
+      width = statuses.map{|s| s.to_command_line.gsub(/\\e\[.*?m/,'').size}.max + 2
+      line = (" "*width).as_underline.in_white
+
+      render "\nThis is ".in_green+"UtSup?".in_magenta+"#{" with #{name.in_yellow}".in_green if name}:"
+      render line
+      puts "\n"
       statuses.each do |status|
-        puts "=> #{status.to_command_line.escape}"
+        render "  "+status.to_command_line
       end
-      puts "----------------------------------------------------------------------------------"
+      render line
+
+      puts "\n"
     end
     
     def get_users
@@ -249,15 +262,14 @@ module Sup
     end
     
     def socket_error
-      puts "UtSup? v.#{VERSION} Offline."
+      render "UtSup? v.#{VERSION} Offline.".in_black.on_red
     end
 
   end
 end
 
-
-class String
-  def escape
-    eval '"'+ gsub(/\"/,'\"') + '"'
+module Kernel
+  def render(string)
+    puts string.escape
   end
 end

data/lib/sup/command.rb

@@ -27,12 +27,12 @@ module Sup
         when "init": 
           Sup::init args.first
           Differ::restart! # to reload projects.yml
-          puts "Supified!"
+          render "Supified!".in_white.on_green
 
         when "in":
           Sup::check_in args.last
           Differ::start!
-          puts "Checked in."
+          render "Sup'd in.".in_green
           
         when "out":
           Sup::check_out args.last
@@ -47,7 +47,7 @@ module Sup
           
         when "nm":
           Sup::undo
-          puts "Undid last Supdate."
+          render "Undid last Supdate.".in_red
           
         when "remove":
           File.unlink File.join(Dir.pwd, PROJECT_CONFIG_PATH)
@@ -75,22 +75,22 @@ module Sup
           # TODO: combine user_name check and supdate into one ActiveResource call -- do name-check & return or supdate on server
           if Api::User.check_name(command)
             Sup::get_statuses :name => command, :today => true
-            return 
+          else
+            # implicit text update: sup "chillin" 
+            Sup::update command
+            render "Supdated!".in_green
           end
-          
-          # implicit text update: sup "chillin" 
-          Sup::update command
-          puts "Supdated."
-
         else
           # full status check
           Sup::get_statuses
         end
         
         # TODO: config file option to set verbosity
-        puts "UtSup? v.#{VERSION} (#{Time.now - bench}s)"
+        render "UtSup?".in_magenta +
+          " v.#{VERSION}".in_green+
+          " (#{Time.now - bench}s)".in_white
 
-      rescue SocketError
+      rescue SocketError, Errno::ECONNREFUSED
         Sup::socket_error
       end
     end

data/lib/sup/yamlize.rb

@@ -52,8 +52,12 @@ class Yamlize
   end
 end
 
-class Object
+module YamlizeMethods
   def yamlize(path, &block)
     Yamlize.new path, self.class, &block
   end
+end
+
+class Object
+  include YamlizeMethods
 end

data/test/test_sup.rb

@@ -5,7 +5,7 @@ class TestSup < Test::Unit::TestCase
   def setup
   end
   
-  def test_truth
-    assert true
+  def test_commands
+    
   end
 end

data/test/test_yamler.rb

@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestYamler < Test::Unit::TestCase
+class TestYamlize < Test::Unit::TestCase
 
   def setup
-    @test_path = File.join(File.dirname(__FILE__),"yamler_test.yml")
-    @test_path2 = File.join(File.dirname(__FILE__),"yamler_test2.yml")
+    @test_path = File.join(File.dirname(__FILE__),"yamlize_test.yml")
+    @test_path2 = File.join(File.dirname(__FILE__),"yamlize_test2.yml")
   end
   
   def teardown
@@ -13,12 +13,12 @@ class TestYamler < Test::Unit::TestCase
   end
   
   def test_init
-    Yamler.new @test_path
+    Yamlize.new @test_path
     assert File.exists?(@test_path)
   end
   
   def test_setter
-    @obj = Yamler.new @test_path
+    @obj = Yamlize.new @test_path
     @obj.name = "nick merwin"
     @obj.title = "programmer"
     
@@ -36,29 +36,29 @@ class TestYamler < Test::Unit::TestCase
   end
   
   def test_save
-    @obj = Yamler.new @test_path
+    @obj = Yamlize.new @test_path
     @obj.name = "nick merwin"
     
     @obj.save
     
-    @obj2 = Yamler.new @test_path
+    @obj2 = Yamlize.new @test_path
     assert_equal  "nick merwin", @obj2.name
   end
   
   def test_block
-    Yamler.new @test_path do |obj|
+    Yamlize.new @test_path do |obj|
       obj.name = "nick merwin"
     end
     
-    @obj = Yamler.new @test_path
+    @obj = Yamlize.new @test_path
     assert_equal  "nick merwin", @obj.name
   end
   
   def test_type
-    @obj = Yamler.new @test_path
+    @obj = Yamlize.new @test_path
     assert_equal Hash, @obj.attributes.class
     
-    @obj2 = Yamler.new @test_path2, Array
+    @obj2 = Yamlize.new @test_path2, Array
     assert_equal Array, @obj2.attributes.class
     
     @obj2 << 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: utsup
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nick Merwin
@@ -30,7 +30,7 @@ cert_chain:
   DrswbWvrKlA=
   -----END CERTIFICATE-----
 
-date: 2009-11-12 00:00:00 -08:00
+date: 2009-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: terminal_markup
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development