utsup 0.1.5 → 0.1.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.6
+
+* ruby 1.9 compatability (thanks, http://github.com/jasherai)
+
 === 0.1.1
 
 * changed diff resolution to 5 minutes

data/README.rdoc

@@ -12,7 +12,9 @@ utsup.com client
 
 == SYNOPSIS:
 
-  FIX (code sample of usage)
+
+do you use git to track project changes? need to know what members of your team are up to in real-time? hate having to ask for status updates?
+UTSUP? allows you to transparently track user interactions with a repository through the command line, via twitter, and on the UTSUP?
 
 == REQUIREMENTS:
 

data/lib/sup/api.rb

@@ -22,6 +22,8 @@ module Sup
         render "Your project_id was invalid, check #{PROJECT_CONFIG_PATH}".in_red
       rescue SocketError
         Sup::socket_error
+      rescue Exception => exc
+        render exc.message.in_red
       end
     end
   

data/lib/sup/base.rb

@@ -1,12 +1,12 @@
 module Sup
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
   
   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"
+  SIGNUP_URL = "http://www.utsup.com"
   
   class << self
     
@@ -75,35 +75,39 @@ module Sup
       "post-receive"  => "sup git receive $@"
     }
     
-    def init(project_title)
-      
+    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
-      GIT_HOOKS.each do |hook, command|
-        path = File.join(Dir.pwd, '.git/hooks/', hook)
-        exists = File.exists?(path)
-        
-        next if exists && File.read(path) =~ /#{Regexp.quote(command)}/
-        
-        File.open(path, (exists ? 'a' : 'w'), 0775) do |f|
-          f.puts command
+      if project.valid?
+        # 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
+        GIT_HOOKS.each do |hook, command|
+          path = File.join(Dir.pwd, '.git/hooks/', hook)
+          exists = File.exists?(path)
+
+          next if exists && File.read(path) =~ /#{Regexp.quote(command)}/
+
+          File.open(path, (exists ? 'a' : 'w'), 0775) do |f|
+            f.puts command
+          end
         end
+                
+      else
+        #// project creation faild
+        render project.errors.full_messages.map &:in_red
       end
-      
     end
 
     # ===========================
@@ -162,7 +166,7 @@ module Sup
       
       case args.first.strip
                 
-      when "checkout":
+      when "checkout"
         previous_head = args[1]
         next_head = args[2]
         branch = args[3] == '1'
@@ -172,20 +176,20 @@ module Sup
         Api::Status.add :status_type => "StatusCheckout",
           :message => current_branch_name
         
-      when "push":
+      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":
+      when "receive"
         Api::Status.add :status_type => "StatusReceive",:message => "received"
       
-      when "merge":
+      when "merge"
         Api::Status.add :status_type => "StatusMerge", :message => "merged"
       
-      when "commit":
+      when "commit"
         
         commit = git.object('HEAD')
         sha = commit.sha

data/lib/sup/command.rb

@@ -10,7 +10,7 @@ module Sup
 
         # no configure
         case command
-        when "setup":
+        when "setup"
           return Sup::setup(args.last)
         end
         
@@ -18,49 +18,49 @@ module Sup
         
         case command
         
-        when "help":
+        when "help"
           puts HELP_TEXT
           
-        when "version":
+        when "version"
           puts VERSION
           
-        when "init": 
+        when "init"
           Sup::init args.first
           Differ::restart! # to reload projects.yml
           render "Supified!".in_green
 
-        when "in":
+        when "in"
           Sup::check_in args.last
           Differ::start!
           render "Sup'd in.".in_green
           
-        when "out":
+        when "out"
           Sup::check_out args.last
           Differ::stop!
           puts "Checked out."
 
         # --- Git -----------------
-        when "git":
+        when "git"
           Sup::git_update args
-        when "push":
+        when "push"
           Sup::git_update "push"
           
-        when "nm":
+        when "nm"
           Sup::undo
           render "Undid last Supdate.".in_red
           
-        when "remove":
+        when "remove"
           File.unlink File.join(Dir.pwd, PROJECT_CONFIG_PATH)
           # TODO: remove git hooks
           puts "De-Supified."
 
-        when "users":
+        when "users"
           Sup::get_users
           
-        when "all":
+        when "all"
           Sup::get_statuses :today => true
           
-        when "search":
+        when "search"
           # TODO: search
           
         when "start"
@@ -70,7 +70,7 @@ module Sup
           Differ::stop!
           puts "Stopped."
           
-        when  /.+/:
+        when  /.+/
           
           # 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)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: utsup
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Nick Merwin
@@ -30,49 +35,59 @@ cert_chain:
   DrswbWvrKlA=
   -----END CERTIFICATE-----
 
-date: 2009-11-17 00:00:00 -08:00
+date: 2010-09-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: git
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: daemons
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: terminal_markup
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 3
         version: 2.3.3
-    version: 
+  type: :development
+  version_requirements: *id004
 description: utsup.com client
 email: 
 - nick@lemurheavy.com
@@ -126,18 +141,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: utsup
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: utsup.com client