jiveapps 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jiveapps (0.1.0.alpha)
+    jiveapps (0.1.1.alpha)
       activesupport (= 2.3.5)
       rest-client (= 1.6.1)
       rubigen (= 1.5.5)

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.1 2011-02-21
+* Major enhancements
+  * "jiveapps clone <appname>" command, shortcut for git clone command for jive apps
+  * Better user feedback for usage output and argument for oauth and sharing commands
+
 === 0.1.0 2011-02-16
 * Major enhancements
   * Multi Developer Collaboration features. Added jiveapps sharing:list, sharing:add, and sharing:remove commands.

data/lib/jiveapps/commands/app.rb

@@ -34,12 +34,33 @@ module Jiveapps::Command
       end
     end
 
+    def clone
+      usage "jiveapps clone <appname>"
+      catch_args :appname
+
+      app = jiveapps.info(@appname)
+      if app == nil
+        display "=== App not found."
+      else
+        # if dir already exists, output message and stop
+        if File.exists?(@appname) && File.directory?(@appname)
+          display "=== #{@appname} folder already exists."
+        else
+          display "=== Cloning #{@appname}..."
+          `git clone #{app['git_url']} --origin jiveapps`
+        end
+      end
+    end
+
     def create
+      usage    = "\n  Usage:\n  $ jiveapps create <appname>"
+      catch_args :appname
+
       debug "Running in debug mode."
       app_list = Jiveapps::Command.run_internal('auth:check', []) # check auth credentials and ssh key before generating app
       return unless app_list.class == Array
       Jiveapps::Command.run_internal('keys:add', [])
-      display "Creating new Jive App \"#{app_name}\"..."
+      display "=== Creating new Jive App \"#{@appname}\"..."
       create_remote_app
       generate_app
       create_local_git_repo_and_push_to_remote
@@ -49,7 +70,7 @@ module Jiveapps::Command
 
     def install
       name = (args.first && !args.first =~ /^\-\-/) ? args.first : extract_app
-      display "Installing \"#{name}\" on the Jive App Sandbox: ", false
+      display "=== Installing \"#{name}\" on the Jive App Sandbox: ", false
       app = jiveapps.install(name)
       handle_response_errors
       if app == nil
@@ -75,7 +96,7 @@ module Jiveapps::Command
 
     def create_remote_app
       display "Step 1 of 4. Check availability and create remote repository: ", false
-      @current_app = jiveapps.create(app_name)
+      @current_app = jiveapps.create(@appname)
       handle_response_errors
     end
 
@@ -87,14 +108,14 @@ module Jiveapps::Command
       require 'rubigen'
       require 'rubigen/scripts/generate'
       RubiGen::Base.use_application_sources!
-      RubiGen::Scripts::Generate.new.run(@args, :generator => 'create')
+      RubiGen::Scripts::Generate.new.run([@appname], :generator => 'create')
     end
 
     def create_local_git_repo_and_push_to_remote
       return unless current_app
       display "Step 3 of 4. Creating local Git repository and push to remote: ", false
 
-      Dir.chdir(File.join(Dir.pwd, app_name)) do
+      Dir.chdir(File.join(Dir.pwd, @appname)) do
 
         run("git init")
         run("git add .")
@@ -111,7 +132,7 @@ module Jiveapps::Command
                 "$ jiveapps keys:list\n" +
                 "$ jiveapps keys:remove <user@machine>\n" +
                 "$ jiveapps keys:add\n" +
-                "$ jiveapps create #{app_name}"
+                "$ jiveapps create #{@appname}"
         delete_app
       end
     end
@@ -120,13 +141,13 @@ module Jiveapps::Command
       return unless current_app
       display "Step 4 of 4. Registering app on the Jive Apps Dev Center and installing on sandbox: ", false
 
-      @current_app = jiveapps.register(app_name)
+      @current_app = jiveapps.register(@appname)
       handle_response_errors
     end
 
     def delete_app
-      run("rm -rf #{app_name}")
-      jiveapps.delete_app(app_name)
+      run("rm -rf #{@appname}")
+      jiveapps.delete_app(@appname)
       @current_app = nil # halt further actions
     end
 
@@ -155,10 +176,6 @@ module Jiveapps::Command
       end
     end
     
-    def app_name
-      args.first
-    end
-
     def run(command)
       if debug_mode?
         puts "DEBUG: $ #{command}"

data/lib/jiveapps/commands/help.rb

@@ -13,6 +13,8 @@ help                                       # show this usage
 
 list                                       # list your apps
 create <app_name>                          # create a new app
+clone <app_name>                           # clone the repository of an existing app
+
 info [--app <app_name>]                    # displays information about an app
 install [--app <app_name>]                 # install an app on the sandbox (if you removed it, you can reinstall)
 

data/lib/jiveapps/commands/oauth.rb

@@ -1,39 +1,32 @@
 module Jiveapps::Command
-  class Oauth < Base
+  class Oauth < BaseWithApp
 
     # Lists OAuth Services registered for this app
     def list
-      app_name = extract_app
-
-      oauth_services = jiveapps.oauth_services(app_name)
-      display_oauth_services(oauth_services, app_name)
+      oauth_services = jiveapps.oauth_services(app)
+      display_oauth_services(oauth_services, app)
     end
     alias :index :list
 
     # Register a new OAuth Service for use with this app
     def add
-      usage    = "\n  Usage:\n  $ jiveapps oauth:add <servicename> <key> <secret>"
-      app_name = extract_app
-      raise CommandFailed, "Missing 3 parameters: <servicename>, <key>, and <secret>#{usage}" unless servicename = args.shift
-      raise CommandFailed, "Missing 2 parameters: <key> and <secret>#{usage}"                 unless key         = args.shift
-      raise CommandFailed, "Missing 1 parameter: <secret>#{usage}"                            unless secret      = args.shift
+      usage "jiveapps oauth:add <servicename> <key> <secret>"
+      catch_args :servicename, :key, :secret
 
-      display "=== Registering a new OAuth Service: \"#{servicename}\""
-      response = jiveapps.add_oauth_service(app_name, servicename, key, secret)
-      Jiveapps::Command.run_internal('oauth:list', ["--app", app_name])
+      display "=== Registering a new OAuth Service: \"#{@servicename}\""
+      response = jiveapps.add_oauth_service(app, @servicename, @key, @secret)
+      Jiveapps::Command.run_internal('oauth:list', ["--app", app])
     end
 
     # Remove an OAuth Service
     def remove
-      usage    = "\n  Usage:\n  $ jiveapps oauth:remove <servicename>"
-      app_name = extract_app
-      raise CommandFailed, "Missing 1 parameter: <servicename>#{usage}" unless servicename = args.shift
+      usage "jiveapps oauth:remove <servicename>"
+      catch_args :servicename
 
-      if confirm "Are you sure you wish to remove the OAuth service \"#{servicename}\"? (y/n)?"
-        display "=== Removing Oauth Service \"#{servicename}\""
-        response = jiveapps.remove_oauth_service(app_name, servicename)
-        Jiveapps::Command.run_internal('oauth:list', ["--app", app_name])
-      end
+      return unless confirm "Are you sure you wish to remove the OAuth service \"#{@servicename}\"? (y/n)?"
+      display "=== Removing Oauth Service \"#{@servicename}\""
+      response = jiveapps.remove_oauth_service(app, @servicename)
+      Jiveapps::Command.run_internal('oauth:list', ["--app", app])
     end
 
   end

data/lib/jiveapps/commands/sharing.rb

@@ -6,21 +6,22 @@ module Jiveapps::Command
     alias :index :list
 
     def add
-      username = args.shift.downcase rescue ''
-      raise(CommandFailed, "Specify a username to give commit access to.") if username == ''
-      display "=== Adding commit access to #{app} for \"#{username}\""
-      jiveapps.add_collaborator(app, username)
+      usage "jiveapps sharing:add <username>"
+      catch_args :username
+
+      display "=== Adding commit access to #{app} for \"#{@username}\""
+      jiveapps.add_collaborator(app, @username)
       display_collaborators
     end
 
     def remove
-      username = args.shift.downcase rescue ''
-      raise(CommandFailed, "Specify a username to remove commit access from.") if username == ''
-      if confirm("Are you sure you wish to remove commit access to #{app} for \"#{username}\"? (y/n)?")
-        display "=== Removing commit access to #{app} for \"#{username}\""
-        jiveapps.remove_collaborator(app, username)
-        display_collaborators
-      end
+      usage "jiveapps sharing:remove <username>"
+      catch_args :username
+
+      return unless confirm("Are you sure you wish to remove commit access to #{app} for \"#{@username}\"? (y/n)?")
+      display "=== Removing commit access to #{app} for \"#{@username}\""
+      jiveapps.remove_collaborator(app, @username)
+      display_collaborators
     end
 
     def display_collaborators

data/lib/jiveapps/helpers.rb

@@ -63,6 +63,17 @@ module Jiveapps
       gets.strip
     end
 
+    def usage(text)
+      @usage = "\n  Usage:\n  $ #{text}"
+    end
+
+    def catch_args(*list)
+      while current_arg = args.shift
+        instance_variable_set "@#{list.shift}", current_arg
+      end
+      raise Jiveapps::Command::CommandFailed, "Missing #{list.length} parameter#{list.length > 1 ? 's' : ''}: #{list.map{|l| '<' + l.to_s + '>'}.join(' ')}#{@usage}" if list.length > 0
+    end
+
     # Display Oauth Service list
     # Example Output:
     # === 2 OAuth services for app-name

data/lib/jiveapps/version.rb

@@ -1,3 +1,3 @@
 module Jiveapps
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/commands/sharing_spec.rb

@@ -14,19 +14,16 @@ module Jiveapps::Command
     it "adds collaborators with default access to view only" do
       @cli.stub!(:args).and_return(['joe_coworker'])
       @cli.jiveapps.should_receive(:add_collaborator).with('myapp', 'joe_coworker')
+      @cli.jiveapps.should_receive(:list_collaborators).and_return([])
       @cli.add
     end
 
     it "removes collaborators" do
       @cli.stub!(:args).and_return(['joe_coworker'])
+      @cli.stub!(:confirm).and_return(true)
       @cli.jiveapps.should_receive(:remove_collaborator).with('myapp', 'joe_coworker')
+      @cli.jiveapps.should_receive(:list_collaborators).and_return([])
       @cli.remove
     end
-
-    # it "transfers ownership" do
-    #   @cli.stub!(:args).and_return(['joe_coworker'])
-    #   @cli.jiveapps.should_receive(:update).with('myapp', :transfer_owner => 'joe_coworker')
-    #   @cli.transfer
-    # end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jiveapps
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Scott Becker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -08:00
+date: 2011-02-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency