jiveapps 1.0.5 → 1.0.6

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.0.6 2012-02-08
+* Enhancements
+  * ADT-26: Prompt to delete files and delete if so
+  * Update error message display logic to handle an array of multiple errors per field.
+  * ADT-16: Implement jiveapps delete command
+  * Rename KEY_REGEX to SSH_KEY_REGEX, avoid name conflict warning in tests.
+  * ADT-27: Check for existance of app dir before create. If it does, halt and display error.
+
 === 1.0.5 2011-07-29
 * Enhancements
   * Update app template to use preferred height of 400 px on home view

data/lib/jiveapps.rb

@@ -5,3 +5,4 @@ end
 
 require 'jiveapps/version'
 require 'jiveapps/client'
+require 'fileutils'

data/lib/jiveapps/client.rb

@@ -173,7 +173,7 @@ class Jiveapps::Client
   def process(method, uri, extra_headers={}, payload=nil)
     headers  = jiveapps_headers.merge(extra_headers)
     args     = [method, payload, headers].compact
-    
+
     begin
       response = resource(uri).send(*args)
       extract_warning(response)

data/lib/jiveapps/commands/app.rb

@@ -24,7 +24,7 @@ module Jiveapps::Command
     end
 
     def info
-      name = (args.first && !args.first =~ /^\-\-/) ? args.first : extract_app
+      name = determine_app_name
       app = jiveapps.info(name)
       if app == nil
         display "App not found."
@@ -58,6 +58,7 @@ module Jiveapps::Command
 
       debug "Running in debug mode."
       check_git_version
+      check_if_dir_already_exists
       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', ["--silent"])
@@ -71,7 +72,7 @@ module Jiveapps::Command
     end
 
     def install
-      name = (args.first && !args.first =~ /^\-\-/) ? args.first : extract_app
+      name = determine_app_name
       display "=== Installing \"#{name}\" on the Jive App Sandbox: ", false
       app = jiveapps.install(name)
       handle_response_errors
@@ -83,6 +84,34 @@ module Jiveapps::Command
       end
     end
 
+    def delete
+      name = determine_app_name
+      app = jiveapps.info(name)
+      if app == nil
+        display "App not found."
+      else
+        if confirm("Are you sure you want to delete the app \"#{name}\" [y/N]? ")
+          display "=== Deleting \"#{name}\": ", false
+          @current_app = jiveapps.delete_app(name)
+          handle_response_errors
+
+          dir_delete_text = "Would you like to delete the local directory \"#{name}\" [y/N]? "
+
+          # if we're in the app directory now
+          if File.split(Dir.pwd).last == name && File.directory?(".git") && confirm(dir_delete_text)
+            Dir.chdir("..")
+            FileUtils.rm_rf(name)
+            display "Local directory \"#{name}\" deleted."
+          # otherwise if that directory exists below the current one
+          elsif File.directory?(name) && confirm(dir_delete_text)
+            FileUtils.rm_rf(name)
+            display "Local directory \"#{name}\" deleted."
+          end
+
+        end
+      end
+    end
+
     private
 
     def create_remote_app
@@ -119,7 +148,7 @@ module Jiveapps::Command
         display "FAILURE"
         display result.error
         display_git_push_fail_info
-        delete_app
+        delete_app_and_dir
       else
         display "SUCCESS"
         Dir.chdir(File.join(Dir.pwd, @appname)) do
@@ -133,7 +162,7 @@ module Jiveapps::Command
       response_code = get_response_code(current_app['app_url'])
       if response_code != 200
         display_git_push_fail_info
-        delete_app
+        delete_app_and_dir
       end
     end
 
@@ -145,7 +174,7 @@ module Jiveapps::Command
       handle_response_errors
     end
 
-    def delete_app
+    def delete_app_and_dir
       run("rm -rf #{@appname}")
       jiveapps.delete_app(@appname)
       @current_app = nil # halt further actions
@@ -189,10 +218,11 @@ module Jiveapps::Command
         display "FAILURE"
         @current_app["errors"].each do |key, value|
           if key == 'base'
-            display "Error: #{value}"
+            display "Error: ", false
           else
-            display "Error on \"#{key}\": #{value}"
+            display "Error on \"#{key}\": ", false
           end
+          display value.to_yaml.gsub(/^--- /, '') # to_yaml easily displays an array as a multiline list. gsub() to get rid of first "---" that to_yaml puts out.
         end
         @current_app = nil
       else
@@ -208,5 +238,15 @@ module Jiveapps::Command
       end
     end
 
+    def check_if_dir_already_exists
+      if File.directory?(@appname)
+        error("A directory named \"#{@appname}\" already exists. Please delete or move directory and try again.")
+      end
+    end
+
+    def determine_app_name
+      args.first && args.first !~ /^\-\-/ ? args.first : extract_app
+    end
+
   end
 end

data/lib/jiveapps/commands/auth.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Jiveapps::Command
   class Auth < Base
     attr_accessor :credentials

data/lib/jiveapps/commands/help.rb

@@ -18,8 +18,10 @@ module Jiveapps::Command
       display "=== App Specific Commands"
       display "    NOTE: run these within app directory, or pass app name with: --app <app_name>"
       display ""
-      display "info                                       # displays information about an app"
+      display "info                                       # display information about an app"
       display "install                                    # install an app on the sandbox (if you removed it, you can reinstall)"
+      display "livedev                                    # start livedev mode"
+      display "delete                                     # delete app"
       display ""
       display "keys                                       # show your user\'s public keys"
       display "keys:add [<path to keyfile>]               # add a public key. optionally include path"
@@ -33,8 +35,6 @@ module Jiveapps::Command
       display "sharing:add <username>                     # add a collaborator"
       display "sharing:remove <username>                  # remove a collaborator"
       display ""
-      display "livedev                                    # start livedev mode"
-      display ""
       display "=== Simple Workflow Example:"
       display ""
       display "$ jiveapps create myapp                    # create a new app named \"myapp\""

data/lib/jiveapps/commands/keys.rb

@@ -1,7 +1,7 @@
 module Jiveapps::Command
   class Keys < Base
 
-    KEY_REGEX = /^((?:[A-Za-z0-9-]+(?:="[^"]+")?,?)+ *)?(ssh-(?:dss|rsa)) *([^ ]*) *(.*)/
+    SSH_KEY_REGEX = /^((?:[A-Za-z0-9-]+(?:="[^"]+")?,?)+ *)?(ssh-(?:dss|rsa)) *([^ ]*) *(.*)/
 
     # Lists uploaded SSH keys
     def list
@@ -76,7 +76,7 @@ module Jiveapps::Command
       end
 
       def validate_key(key, keyfile)
-        if KEY_REGEX.match(key.strip).nil?
+        if SSH_KEY_REGEX.match(key.strip).nil?
           fake_key = "ssh-rsa NAyG4kbVIZyokH/hMDkLbrFBktxPgsQKBgQDshif7w5RgOTK0eaNC6AJbjX0NTOgoTtbjQIX0s9fAUiakcxU3Qqna9ONXlL1mgf+WZ3KgOyUyNcgz2JPWinZseoTDNukRixqcLS9HO8qOWoLUHJZID1q1xf/btESt4UylEMiykEn712YGqCpVdFxX+q7z7b6Z5G/9n49hKWN22wKBgQCBDM1DUeqOX5Li2Hnj/EF/PfhGypAlhz/Klh40foNq7TziwFtkTZz06HpRNIhK2VcoLhU49f2v6CrcaEmll9Zs5Hw2VMrSeTNReO5gRfxlrId1imhfBkYUaZImEKSWAe3HgdyihCmXqf5SCQOtVmm5lxbgaSBjz== your.name@machine.name"
 
           raise CommandFailed, "Invalid SSH public key format found at \"#{keyfile}\":\n\n#{key}\n\nExample of correct format:\n\n#{fake_key}\n\nCheck and fix, or regenerate key with this command:\n$ ssh-keygen -t rsa"

data/lib/jiveapps/version.rb

@@ -1,3 +1,3 @@
 module Jiveapps
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/commands/app_spec.rb

@@ -27,10 +27,10 @@ module Jiveapps::Command
     describe "app info" do
       it "shows info when name specified and rest client returns an app" do
         @cli.stub!(:args).and_return(['myapp'])
-        @cli.jiveapps.should_receive(:info).with('myapp').and_return({ 
-          'name' => 'myapp', 
+        @cli.jiveapps.should_receive(:info).with('myapp').and_return({
+          'name' => 'myapp',
           'app_url' => 'http://app_url',
-          'git_url' => 'http://git_url' 
+          'git_url' => 'http://git_url'
         })
         @cli.should_receive(:display).with('=== myapp')
         @cli.should_receive(:display).with("App URL:               http://app_url")
@@ -59,5 +59,23 @@ module Jiveapps::Command
 
     end
 
+    describe "check_if_dir_already_exists" do
+      it "should throw an error if dir exists" do
+        name = "random-name-#{(rand * 100000).to_i}"
+        FileUtils.mkdir(name)
+        @cli.instance_variable_set("@appname", name)
+        @cli.should_receive(:error).with("A directory named \"#{name}\" already exists. Please delete or move directory and try again.")
+        @cli.send :check_if_dir_already_exists
+        FileUtils.rm_rf(name)
+      end
+
+      it "should not throw an error if dir does not exist" do
+        name = "random-name-#{(rand * 100000).to_i}"
+        @cli.instance_variable_set("@appname", name)
+        @cli.should_not_receive(:error)
+        @cli.send :check_if_dir_already_exists
+      end
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jiveapps
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Scott Becker
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 -07:00
-default_executable: 
+date: 2012-02-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -224,7 +223,6 @@ files:
 - spec/commands/oauth_spec.rb
 - spec/commands/sharing_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/jivesoftware/jiveapps-gem
 licenses: []
 
@@ -254,17 +252,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The "jiveapps" gem is a set of command line tools for building and hosting Jive App front-ends.
-test_files: 
-- spec/client_spec.rb
-- spec/commands/app_spec.rb
-- spec/commands/base_spec.rb
-- spec/commands/help_spec.rb
-- spec/commands/keys_spec.rb
-- spec/commands/livedev_spec.rb
-- spec/commands/oauth_spec.rb
-- spec/commands/sharing_spec.rb
-- spec/spec_helper.rb
+test_files: []
+