utsup 0.1.2 → 0.1.3

data/Manifest.txt

@@ -16,6 +16,7 @@ lib/sup/differ/differ.rb
 lib/sup/yamlize.rb
 lib/sup/command.rb
 lib/sup/help.rb
+lib/sup/base.rb
 lib/sup/api.rb
 script/console
 script/destroy

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'],['terminal_markup']]
+  self.extra_deps         = [['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

@@ -10,264 +10,13 @@ require 'git'
 
 require 'terminal_markup'
 
+require 'sup/base'
 require 'sup/yamlize'
-
 require 'sup/differ/differ'
 require 'sup/api'
 require 'sup/command'
 require 'sup/help'
 
-module Sup
-  VERSION = '0.1.2'
-  GIT_HOOKS = %w(post-commit post-receive post-merge post-checkout) #TODO: post-rebase?
-  
-  GLOBAL_CONFIG_PATH          = '~/.utsup/config.yml'
-  GLOBAL_PROJECT_CONFIG_PATH  = '~/.utsup/projects.yml'
-  PROJECT_CONFIG_PATH         = '.git/utsup.yml'
-  
-  URL = "https://utsup.heroku.com"
-  SIGNUP_URL = "http://utsup.com"
-  
-  class << self
-    
-    # ===========================
-    # Setup
-    # ===========================
-    
-    def sign_in
-      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: ".in_yellow.escape
-        email = gets.chomp
-        print "Password: ".in_yellow.escape
-        system "stty -echo"
-        password = gets.chomp
-        system "stty echo"
-        puts ""
-        
-        if api_key = Api::User.get_api_key(email, password)
-          return api_key
-        else
-          render "Couldn't find that email/password combo...".in_red
-        end
-      end
-    end
-    
-    def setup(api_key=nil)
-      require 'fileutils'
-      
-      # --- global init
-      global_config_path = File.expand_path(GLOBAL_CONFIG_PATH)
-      
-      # for back-compat with old config file
-      oldpath = File.dirname(global_config_path)
-      if File.exists?(oldpath) && !File.directory?(oldpath)
-        FileUtils.mv oldpath, oldpath+'.bak'
-        FileUtils.mkdir File.dirname(global_config_path)
-        FileUtils.mv oldpath+'.bak', global_config_path
-      end
-      
-      FileUtils.mkdir File.dirname(global_config_path) rescue nil
-      global_config = Yamlize.new global_config_path
-      
-      unless global_config['api_key']
-        global_config.api_key = api_key || sign_in
-        global_config.save
-        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
-        render "You're good to go.".in_green
-      end
-    end
-    
-    # ===========================
-    # Init
-    # ===========================
-    
-    def init(project_title)
-      
-      # --- project init
-      project_title = File.basename(Dir.pwd) if project_title.blank? || project_title == "."
-      project = Api::Project.create :title => project_title
-      
-      # add project id to .git
-      Yamlize.new File.join(Dir.pwd, PROJECT_CONFIG_PATH) do |project_config|
-        project_config.project_id = project.id
-      end
-      
-      # add project path and id to global project config (for differ)
-      Yamlize.new GLOBAL_PROJECT_CONFIG_PATH, Array do |global_project_config|
-        global_project_config << {'path'=>Dir.pwd, 'id'=>project.id}
-        global_project_config.uniq!
-      end
-      
-      # --- write git hooks
-      #TODO: option to manually add hooks if they already have some...
-      GIT_HOOKS.each do |hook|
-        path = File.join(Dir.pwd, '.git/hooks/', hook)
-        hook_cmd = File.read(File.join(File.dirname(__FILE__),'hooks',hook))
-        
-        if File.exists?(path)
-          puts "You already have a git hook here: #{path}"
-          puts "Please make sure it's executable add this to it:"
-          puts hook_cmd + "\n"
-          next
-        end
-        
-        File.open(path, 'w', 0775) do |f|
-          f.write hook_cmd
-        end
-      end
-      
-    end
-
-    # ===========================
-    # Configure
-    # ===========================
-
-    def configure
-      
-      global_config = Yamlize.new GLOBAL_CONFIG_PATH
-      project_config = Yamlize.new(File.join(Dir.pwd, PROJECT_CONFIG_PATH)) rescue {}
-      global_project_config = Yamlize.new GLOBAL_PROJECT_CONFIG_PATH
-      
-      unless global_config['api_key']
-        render "You need to run 'sup setup <api_key>' first, thanks!".in_red
-        exit 0
-      end
-      
-      # --- configure API
-      Api::Base.project_id = project_config['project_id']
-      Api::Base.password = project_config['api_key'] || global_config['api_key']
-      Api::Base.site = "http://#{project_config['domain'] || global_config['domain'] || 'utsup.com'}"
-    end
-    
-    # ===========================
-    # Check In/Out
-    # ===========================
-    def check_in(message)
-      Api::Status.add :status_type => "StatusIn", :message => message
-    end
-    
-    def check_out(message)
-      Api::Status.add :status_type => "StatusOut", :message => message
-    end
-    
-    # ===========================
-    # undo
-    # ===========================    
-    
-    def undo
-      Api::Status.delete :undo
-    end
-    
-    # ===========================
-    # Git Update 
-    # ===========================
-  
-    def current_branch_name
-      `git branch 2> /dev/null | grep -e ^*`[/^\* (.*?)\n/,1]
-    end
-  
-    def git_update(*args)
-      git = Git.open(Dir.pwd)
-
-      args.flatten!
-      
-      case args.first.strip
-                
-      when "checkout":
-        previous_head = args[1]
-        next_head = args[2]
-        branch = args[3] == '1'
-        
-        # TODO: get previous branch name from ref
-        
-        Api::Status.add :status_type => "StatusCheckout",
-          :message => current_branch_name
-        
-      when "push":
-        resp = `git push #{args[1..-1]*' '} 2>&1`
-        puts resp
-        unless resp =~ /Everything up-to-date/
-          Api::Status.add :status_type => "StatusPush", :message => "pushed"
-        end
-        
-      when "receive":
-        Api::Status.add :status_type => "StatusReceive",:message => "received"
-      
-      when "merge":
-        Api::Status.add :status_type => "StatusMerge", :message => "merged"
-      
-      when "commit":
-        
-        commit = git.object('HEAD')
-        sha = commit.sha
-      
-        Api::Status.add :status_type => "StatusCommit", 
-          :message => commit.message, 
-          :ref => sha, :text => `git diff HEAD~ HEAD`
-                  
-      else
-        puts "WTF git status is that?"
-      end
-        
-    end
-
-    # ===========================
-    # Update
-    # ===========================
-        
-    def update(message)
-      Api::Status.add :status_type => "StatusUpdate", :message => message
-    end
-    
-    # ===========================
-    # Get Statuses
-    # ===========================
-    
-    def get_statuses(opts={})
-      name = opts[:name]
-      
-      statuses = Api::Status.find :all, :params => {
-        :name => name, 
-        :today => opts[:today]
-      }
-      
-      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|
-        render "  "+status.to_command_line
-      end
-      render line
-
-      puts "\n"
-    end
-    
-    def get_users
-      users = Api::User.find :all
-      
-      puts "#{users.first.company.title} Users:"
-      users.each do |user|
-        puts user.to_command_line
-      end
-    end
-    
-    def socket_error
-      render "UtSup? v.#{VERSION} Offline.".in_black.on_red
-    end
-
-  end
-end
-
 module Kernel
   def render(string)
     puts string.escape

data/lib/sup/api.rb

@@ -12,14 +12,14 @@ module Sup
     class Status < Base
       def self.add(attributes)
         unless self.project_id
-          puts "You're not in a Sup project.  Run 'sup init' to add this directory."
-          return
+          render "You're not in an UtSup project.  Run 'sup init' to add this directory.".in_red
+          return false
         end
         
         create attributes.merge({:project_id => @@project_id, :branch => Sup::current_branch_name, :version => VERSION})
         
       rescue ActiveResource::ResourceNotFound
-        puts "Your project_id was invalid, check #{PROJECT_CONFIG_PATH}"
+        render "Your project_id was invalid, check #{PROJECT_CONFIG_PATH}".in_red
       rescue SocketError
         Sup::socket_error
       end
@@ -32,7 +32,7 @@ module Sup
     class User < Base
       def self.get_api_key(email,password)
         project_config = Yamlize.new(File.join(Dir.pwd, PROJECT_CONFIG_PATH)) rescue {}
-        Base.site = "http://#{project_config['domain'] || "utsup.com"}"
+        Base.site = project_config['domain'] || API_URL
         
         begin
           post(:get_api_key, :email => email, :password => password).body

data/lib/sup/base.rb

@@ -0,0 +1,250 @@
+module Sup
+  VERSION = '0.1.3'
+  GIT_HOOKS = %w(post-commit post-receive post-merge post-checkout) #TODO: post-rebase?
+  
+  GLOBAL_CONFIG_PATH          = '~/.utsup/config.yml'
+  GLOBAL_PROJECT_CONFIG_PATH  = '~/.utsup/projects.yml'
+  PROJECT_CONFIG_PATH         = '.git/utsup.yml'
+  
+  API_URL = "https://utsup.heroku.com"
+  SIGNUP_URL = "http://utsup.com"
+  
+  class << self
+    
+    # ===========================
+    # Setup
+    # ===========================
+    
+    def sign_in
+      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: ".in_yellow.escape
+        email = gets.chomp
+        print "Password: ".in_yellow.escape
+        system "stty -echo"
+        password = gets.chomp
+        system "stty echo"
+        puts ""
+        
+        if api_key = Api::User.get_api_key(email, password)
+          return api_key
+        else
+          render "Couldn't find that email/password combo...".in_red
+        end
+      end
+    end
+    
+    def setup(api_key=nil)
+      require 'fileutils'
+      
+      # --- global init
+      global_config_path = File.expand_path(GLOBAL_CONFIG_PATH)
+      
+      # for back-compat with old config file
+      oldpath = File.dirname(global_config_path)
+      if File.exists?(oldpath) && !File.directory?(oldpath)
+        FileUtils.mv oldpath, oldpath+'.bak'
+        FileUtils.mkdir File.dirname(global_config_path)
+        FileUtils.mv oldpath+'.bak', global_config_path
+      end
+      
+      FileUtils.mkdir File.dirname(global_config_path) rescue nil
+      global_config = Yamlize.new global_config_path
+      
+      unless global_config['api_key']
+        global_config.api_key = api_key || sign_in
+        global_config.save
+        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
+        render "You're good to go.".in_green
+      end
+    end
+    
+    # ===========================
+    # Init
+    # ===========================
+    
+    def init(project_title)
+      
+      # --- project init
+      project_title = File.basename(Dir.pwd) if project_title.blank? || project_title == "."
+      project = Api::Project.create :title => project_title
+      
+      # add project id to .git
+      Yamlize.new File.join(Dir.pwd, PROJECT_CONFIG_PATH) do |project_config|
+        project_config.project_id = project.id
+      end
+      
+      # add project path and id to global project config (for differ)
+      Yamlize.new GLOBAL_PROJECT_CONFIG_PATH, Array do |global_project_config|
+        global_project_config << {'path'=>Dir.pwd, 'id'=>project.id}
+        global_project_config.uniq!
+      end
+      
+      # --- write git hooks
+      #TODO: option to manually add hooks if they already have some...
+      GIT_HOOKS.each do |hook|
+        path = File.join(Dir.pwd, '.git/hooks/', hook)
+        hook_cmd = File.read(File.join(File.dirname(__FILE__),'hooks',hook))
+        
+        if File.exists?(path)
+          puts "You already have a git hook here: #{path}"
+          puts "Please make sure it's executable add this to it:"
+          puts hook_cmd + "\n"
+          next
+        end
+        
+        File.open(path, 'w', 0775) do |f|
+          f.write hook_cmd
+        end
+      end
+      
+    end
+
+    # ===========================
+    # Configure
+    # ===========================
+
+    def configure
+      
+      global_config = Yamlize.new GLOBAL_CONFIG_PATH
+      project_config = Yamlize.new(File.join(Dir.pwd, PROJECT_CONFIG_PATH)) rescue {}
+      global_project_config = Yamlize.new GLOBAL_PROJECT_CONFIG_PATH
+      
+      unless global_config['api_key']
+        setup
+        exit 0
+      end
+      
+      # --- configure API
+      Api::Base.project_id = project_config['project_id']
+      Api::Base.password = project_config['api_key'] || global_config['api_key']
+      Api::Base.site = project_config['domain'] || global_config['domain'] || API_URL
+    end
+    
+    # ===========================
+    # Check In/Out
+    # ===========================
+    def check_in(message)
+      Api::Status.add :status_type => "StatusIn", :message => message
+    end
+    
+    def check_out(message)
+      Api::Status.add :status_type => "StatusOut", :message => message
+    end
+    
+    # ===========================
+    # undo
+    # ===========================    
+    
+    def undo
+      Api::Status.delete :undo
+    end
+    
+    # ===========================
+    # Git Update 
+    # ===========================
+  
+    def current_branch_name
+      `git branch 2> /dev/null | grep -e ^*`[/^\* (.*?)\n/,1]
+    end
+  
+    def git_update(*args)
+      git = Git.open(Dir.pwd)
+
+      args.flatten!
+      
+      case args.first.strip
+                
+      when "checkout":
+        previous_head = args[1]
+        next_head = args[2]
+        branch = args[3] == '1'
+        
+        # TODO: get previous branch name from ref
+        
+        Api::Status.add :status_type => "StatusCheckout",
+          :message => current_branch_name
+        
+      when "push":
+        resp = `git push #{args[1..-1]*' '} 2>&1`
+        puts resp
+        unless resp =~ /Everything up-to-date/
+          Api::Status.add :status_type => "StatusPush", :message => "pushed"
+        end
+        
+      when "receive":
+        Api::Status.add :status_type => "StatusReceive",:message => "received"
+      
+      when "merge":
+        Api::Status.add :status_type => "StatusMerge", :message => "merged"
+      
+      when "commit":
+        
+        commit = git.object('HEAD')
+        sha = commit.sha
+      
+        Api::Status.add :status_type => "StatusCommit", 
+          :message => commit.message, 
+          :ref => sha, :text => `git diff HEAD~ HEAD`
+                  
+      else
+        puts "WTF git status is that?"
+      end
+        
+    end
+
+    # ===========================
+    # Update
+    # ===========================
+        
+    def update(message)
+      Api::Status.add :status_type => "StatusUpdate", :message => message
+    end
+    
+    # ===========================
+    # Get Statuses
+    # ===========================
+    
+    def get_statuses(opts={})
+      name = opts[:name]
+      
+      statuses = Api::Status.find :all, :params => {
+        :name => name, 
+        :today => opts[:today]
+      }
+      
+      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|
+        render "  "+status.to_command_line
+      end
+      render line
+
+      puts "\n"
+    end
+    
+    def get_users
+      users = Api::User.find :all
+      
+      puts "#{users.first.company.title} Users:"
+      users.each do |user|
+        puts user.to_command_line
+      end
+    end
+    
+    def socket_error
+      render "UtSup? v.#{VERSION} Offline.".in_black.on_red
+    end
+
+  end
+end

data/lib/sup/command.rb

@@ -27,7 +27,7 @@ module Sup
         when "init": 
           Sup::init args.first
           Differ::restart! # to reload projects.yml
-          render "Supified!".in_white.on_green
+          render "Supified!".in_green
 
         when "in":
           Sup::check_in args.last
@@ -77,8 +77,7 @@ module Sup
             Sup::get_statuses :name => command, :today => true
           else
             # implicit text update: sup "chillin" 
-            Sup::update command
-            render "Supdated!".in_green
+            render "Supdated!".in_green if Sup::update(command)
           end
         else
           # full status check

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: utsup
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nick Merwin
@@ -30,11 +30,11 @@ cert_chain:
   DrswbWvrKlA=
   -----END CERTIFICATE-----
 
-date: 2009-11-13 00:00:00 -08:00
+date: 2009-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: schacon-git
+  name: git
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -103,6 +103,7 @@ files:
 - lib/sup/yamlize.rb
 - lib/sup/command.rb
 - lib/sup/help.rb
+- lib/sup/base.rb
 - lib/sup/api.rb
 - script/console
 - script/destroy

metadata.gz.sig

@@ -1,2 +1,3 @@
-4�����'����Νz�F�\
LpѢ�
-�Y�s�i�,>B��4�F���	TF�}�C�'ژ�h���D�Lģ��@)Y	dl���6�\���������=Ok�K�L��l�^鑌�/p6*���[��ŋ�`��9ض
+�ޯ�t9F����&��'��#12D�O�0����\*c=��M8����~y��8Q;f�0��B��K�U*}���dp�6�}����+�(o���@X�ro�b8�
+,+a�#p`�{�*Gm>:�y7\)�p�wV��L�^���䨛��$�������h�z�X�
+R{��0���f�9=(-=5Y�!�fu�|.�I(� -~����i}�(�U�