jiveapps 0.0.4 → 0.0.5

data/Gemfile

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+group :test do
+  gem 'rspec', '>= 2.2.0'
+  gem 'webmock', '>= 1.6.1'
+end
+
+gem 'rest-client', '>= 1.6.1'
+gem 'rubigen', '>= 1.5.5'
+gem 'json_pure', '>= 1.4.6'

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.0.5 2010-12-06
+* Bug Fixes
+  * Re-enabled re-authentication
+* Major Enhancements
+  * Better user feedback when creating apps
+  * Better error reporting
+  * No longer require JSON C extension (no GCC or XCode required)
+
 === 0.0.4 2010-11-22
 * Major enhancements
   * SSL support

data/Manifest.txt

@@ -1,4 +1,5 @@
 .rspec
+Gemfile
 History.txt
 Manifest.txt
 PostInstall.txt

data/Rakefile

@@ -1,8 +1,10 @@
+$LOAD_PATH << './lib'
+
 require 'rubygems'
 gem 'hoe', '>= 2.1.0'
 require 'hoe'
 require 'fileutils'
-require './lib/jiveapps'
+require 'jiveapps'
 
 Hoe.plugin :newgem
 # Hoe.plugin :website
@@ -14,12 +16,12 @@ $hoe = Hoe.spec 'jiveapps' do
   self.developer 'Scott Becker', 'becker.scott@gmail.com'
   self.description          = "A set of command line tools for creating Jive Apps."
   self.summary              = self.description
-  self.version              = "0.0.4"
+  self.version              = "0.0.5"
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps           = [
     ['rest-client'],
-    ['json'],
+    ['json_pure'],
     ['rubigen']
   ]
 end
@@ -66,3 +68,15 @@ RSpec::Core::RakeTask.new('rcov') do |t|
 end
 
 task :default => :spec
+
+desc "Fix password"
+task "fix_pass" do
+  system "rm ~/.jiveapps/credentials"
+  system "cp ~/.jiveapps/credentials_right ~/.jiveapps/credentials"
+end
+
+desc "Break password"
+task "break_pass" do
+  system "rm ~/.jiveapps/credentials"
+  system "cp ~/.jiveapps/credentials_wrong ~/.jiveapps/credentials"
+end

data/lib/jiveapps.rb

@@ -1,7 +1,7 @@
 module Jiveapps
-  VERSION = '0.0.4'
-  WEBHOST = 'apphosting.jivesoftware.com'
-  GITHOST = 'apphosting.jivesoftware.com'
+  VERSION = '0.0.5'
+  WEBHOST = 'https://apphosting.jivesoftware.com'
+  MODE    = 'production'
 end
 
 require 'jiveapps/client'

data/lib/jiveapps/client.rb

@@ -4,12 +4,8 @@ require 'json'
 
 class Jiveapps::Client
 
-  def self.version
-    '0.0.4'
-  end
-
   def self.gem_version_string
-    "jiveapps-gem/#{version}"
+    "jiveapps-gem/#{Jiveapps::VERSION}"
   end
 
   attr_reader :host, :user, :password
@@ -28,7 +24,7 @@ class Jiveapps::Client
     if apps.class == Array
       apps.map { |item| item['app'] }
     else
-      return []
+      return apps
     end
   end
 
@@ -41,13 +37,13 @@ class Jiveapps::Client
     end
   end
 
-  def create(name)
+  def post_app(path, obj)
     begin
-      item = post("/apps", {:app => {:name => name}})
+      item = post(path, obj)
       if item.class == Hash && item['app']
         item['app']
       else
-        nil
+        item
       end
     rescue => e
       if e.response.body =~ /^\{/ # assume this is JSON if it starts with "{"
@@ -59,24 +55,16 @@ class Jiveapps::Client
     end
   end
 
-  def register(name)
-    item = post("/apps/#{escape(name)}/register", {})
+  def create(name)
+    post_app("/apps", {:app => {:name => name}})
+  end
 
-    if item.class == Hash && item['app']
-      item['app']
-    else
-      nil
-    end
+  def register(name)
+    post_app("/apps/#{escape(name)}/register", {})
   end
 
   def install(name)
-    item = post("/apps/#{escape(name)}/register", {})
-
-    if item.class == Hash && item['app']
-      item['app']
-    else
-      nil
-    end
+    post_app("/apps/#{escape(name)}/install", {})
   end
 
   ### SSH Keys
@@ -134,13 +122,14 @@ 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)
       parse_response(response.to_s)
-    rescue => e
-      puts e.response
+    rescue RestClient::BadRequest => e
+      puts e.response.body
+      return nil
     end
   end
 
@@ -167,11 +156,12 @@ class Jiveapps::Client
   end
 
   def escape(value) # :nodoc:
-    ### Ugly hack - nginx/passenger unescapes the name before it gets to rails, causing routes to fail. double encode in production
-    if Jiveapps::WEBHOST =~ /^becker/ # in dev mode
-      _escape(value)
-    else # in production mode
+    ### Ugly hack - nginx/passenger unescapes the name before it gets
+    ### to rails, causing routes to fail. double encode in production
+    if Jiveapps::MODE == 'production'
       _escape(_escape(value))
+    else
+      _escape(value)
     end
   end
 
@@ -185,7 +175,7 @@ class Jiveapps::Client
     if uri =~ /^http?/
       RestClient::Resource.new(uri, user, password)
     else
-      RestClient::Resource.new("https://#{host}", user, password)[uri]
+      RestClient::Resource.new(host, user, password)[uri]
     end
   end
 

data/lib/jiveapps/commands/app.rb

@@ -3,8 +3,15 @@ module Jiveapps::Command
 
     attr_reader :current_app
 
+    def version
+      display Jiveapps::Client.gem_version_string
+    end
+
     def list
-      formatted_list = jiveapps.list.map do |app|
+      jiveapps_list = jiveapps.list
+      return if jiveapps_list.nil?
+
+      formatted_list = jiveapps_list.map do |app|
         "  - " + app['name']
       end
 
@@ -32,8 +39,10 @@ module Jiveapps::Command
     end
 
     def create
-      # check auth credentials and ssh key before generating app
-      Jiveapps::Command.run_internal('auth:check', [])
+      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
+      display "Creating new Jive App \"#{app_name}\"..."
       create_remote_app
       generate_app
       create_local_git_repo_and_push_to_remote
@@ -42,11 +51,13 @@ module Jiveapps::Command
     end
 
     def install
+      display "Installing \"#{app_name}\" on the Jive App Sandbox: ", false
       app = jiveapps.install(app_name)
+      handle_response_errors
       if app == nil
         display "App not found."
       else
-        display "=== #{app['name']} - Installed"
+        display "=== #{app['name']}"
         display_app_info(app)
       end
     end
@@ -65,19 +76,14 @@ module Jiveapps::Command
     end
 
     def create_remote_app
-      debug "Creating remote app."
+      display "Step 1 of 4. Check availability and create remote repository: ", false
       @current_app = jiveapps.create(app_name)
-      if @current_app.class == Hash && @current_app["errors"]
-        if @current_app["errors"]["name"]
-          display "Error: Name #{@current_app["errors"]["name"]}"
-        end
-        @current_app = nil
-      end
+      handle_response_errors
     end
 
     def generate_app
       return unless current_app
-      debug "Generating local app."
+      display "Step 2 of 4. Generate app scaffolding."
 
       require 'rubygems'
       require 'rubigen'
@@ -88,7 +94,7 @@ module Jiveapps::Command
 
     def create_local_git_repo_and_push_to_remote
       return unless current_app
-      debug "Creating local git repo and pushing to remote."
+      display "Step 3 of 4. Creating local Git repository and push to remote: ", false
 
       Dir.chdir(File.join(Dir.pwd, app_name)) do
 
@@ -98,13 +104,20 @@ module Jiveapps::Command
         run("git remote add jiveapps #{current_app['git_url']}")
         run("git push jiveapps master")
       end
+
+      if $? == 0
+        display "SUCCESS"
+      else
+        display "FAILURE"
+      end
     end
 
     def register_app
       return unless current_app
-      debug "Registering 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)
+      handle_response_errors
     end
 
     def create_notify_user
@@ -149,5 +162,17 @@ module Jiveapps::Command
       end
     end
 
+    def handle_response_errors
+      if @current_app.class == Hash && @current_app["errors"]
+        display "FAILURE"
+        @current_app["errors"].each do |key, value|
+          display "Error on \"#{key}\": #{value}"
+        end
+        @current_app = nil
+      else
+        display "SUCCESS"
+      end
+    end
+
   end
 end

data/lib/jiveapps/commands/auth.rb

@@ -62,7 +62,7 @@ module Jiveapps::Command
     end
 
     def ask_for_credentials
-      puts "Enter your Jiveapps credentials."
+      puts "Enter your Jive Apps Developer Community credentials. (https://developers.jivesoftware.com)"
 
       print "Username: "
       user = ask

data/lib/jiveapps/commands/help.rb

@@ -2,6 +2,7 @@ module Jiveapps::Command
   class Help < Base
 
     def index
+      puts "jiveapps gem: v#{Jiveapps::VERSION}"
       puts <<-eos
 === Summary
 The "jiveapps" program is a command line tool for building and hosting Jive App front-ends.

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ Dir["#{File.dirname(__FILE__)}/../lib/jiveapps/commands/*"].each { |c| require c
 require 'jiveapps/client'
 
 def stub_api_request(method, path)
-  stub_request(method, "https://#{Jiveapps::WEBHOST}#{path}")
+  stub_request(method, "#{Jiveapps::WEBHOST}#{path}")
 end
 
 def prepare_command(klass)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jiveapps
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Scott Becker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -08:00
+date: 2010-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -87,9 +87,9 @@ dependencies:
         hash: 19
         segments: 
         - 2
-        - 6
-        - 2
-        version: 2.6.2
+        - 7
+        - 0
+        version: 2.7.0
   type: :development
   version_requirements: *id005
 description: A set of command line tools for creating Jive Apps.
@@ -105,6 +105,7 @@ extra_rdoc_files:
 - PostInstall.txt
 files: 
 - .rspec
+- Gemfile
 - History.txt
 - Manifest.txt
 - PostInstall.txt