jiveapps 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.0.3
+* Enhancements
+  * change icon and screenshot hrefs to be relative urls
+  * change screenshot rel attributes to be numbered 1-5
+* Bug fix
+  * fix issue where new app is deleted if using older version of Git (<1.7) that doesn't support "git branch --set-upstream"
+  * fix invalid reference to "images/j-icon-jaf-48.png", changed to "images/icon48.png"
+  * remove hack to double escape URL parameters in production to work around old nginx/passenger bug
+  * escape remaining url parameters that were not yet being escaped
+  * removed RCov.pattern= since it no longer has any functionality
+
 === 1.0.2 2011-04-29
 * Minor Enhancement
   * update app template with new syntax for screenhots in <Link> tags. remove 'screenshot' and 'thumbnail' attributes from <ModulePrefs>

data/app_generators/create/templates/app.xml

@@ -15,17 +15,17 @@
     <Require feature="views" />
 
     <!-- Icons: 3 sizes, 16x16, 48x48, 128x128 -->
-    <Link rel="Icon"       href="<%= Jiveapps::WEBHOST %>/apps/dev/<%= name %>/images/icon16.png" />
-    <Link rel="MediumIcon" href="<%= Jiveapps::WEBHOST %>/apps/dev/<%= name %>/images/icon48.png" />
-    <Link rel="LargeIcon"  href="<%= Jiveapps::WEBHOST %>/apps/dev/<%= name %>/images/icon128.png" />
+    <Link rel="Icon"       href="images/icon16.png" />
+    <Link rel="MediumIcon" href="images/icon48.png" />
+    <Link rel="LargeIcon"  href="images/icon128.png" />
 
     <!-- Screenshots: 600w x 400h, should include at least 1 and up to 5 -->
     <!--
-    <Link rel="Screenshot" href="<%= Jiveapps::WEBHOST %>/apps/dev/<%= name %>/images/screenshot1.png" />
-    <Link rel="Screenshot" href="<%= Jiveapps::WEBHOST %>/apps/dev/<%= name %>/images/screenshot2.png" />
-    <Link rel="Screenshot" href="<%= Jiveapps::WEBHOST %>/apps/dev/<%= name %>/images/screenshot3.png" />
-    <Link rel="Screenshot" href="<%= Jiveapps::WEBHOST %>/apps/dev/<%= name %>/images/screenshot4.png" />
-    <Link rel="Screenshot" href="<%= Jiveapps::WEBHOST %>/apps/dev/<%= name %>/images/screenshot5.png" />
+    <Link rel="Screenshot1" href="images/screenshot1.png" />
+    <Link rel="Screenshot2" href="images/screenshot2.png" />
+    <Link rel="Screenshot3" href="images/screenshot3.png" />
+    <Link rel="Screenshot4" href="images/screenshot4.png" />
+    <Link rel="Screenshot5" href="images/screenshot5.png" />
     -->
 
     <!-- OAuth Services: https://developers.jivesoftware.com/community/docs/DOC-1161 -->

data/app_generators/create/templates/hello.html

@@ -29,10 +29,10 @@
       h3 {background-color:#e5e5e5;padding:3px;font-size:105%;}
       h5 {font-size:105%;margin:0;}
       #devlinks h3 {margin:2px;}
-      #devlinks div.community {padding:0;margin:0;background: url('images/j-icon-jaf-48.png') no-repeat; background-position: 10px 2px ; height:70px;}
-      #devlinks div.documentation {padding:0;margin:0;background: url('images/j-icon-jaf-48.png') no-repeat; background-position: 10px 2px ; height:70px;}
-      #devlinks div.login {padding:0;margin:0;background: url('images/j-icon-jaf-48.png') no-repeat; background-position: 10px 2px ; height:70px;}
-      #devlinks div.market {padding:0;margin:0;background: url('images/j-icon-jaf-48.png') no-repeat; background-position: 10px 2px ; height:70px;}
+      #devlinks div.community {padding:0;margin:0;background: url('images/icon48.png') no-repeat; background-position: 10px 2px ; height:70px;}
+      #devlinks div.documentation {padding:0;margin:0;background: url('images/icon48.png') no-repeat; background-position: 10px 2px ; height:70px;}
+      #devlinks div.login {padding:0;margin:0;background: url('images/icon48.png') no-repeat; background-position: 10px 2px ; height:70px;}
+      #devlinks div.market {padding:0;margin:0;background: url('images/icon48.png') no-repeat; background-position: 10px 2px ; height:70px;}
       #devlinks div p {margin:10px 0px 0px 80px;}
       #devlinks h3 a,a:hover {text-decoration:none;}
       #devlinks ul {margin:5px 0px 0px 50px;}

data/autotest/discover.rb

@@ -4,4 +4,3 @@ Autotest.add_discovery { "rspec2" }
 require 'autotest/rcov'
 Autotest::RCov.command = 'rcov'
 Autotest::RCov.options = ['--exclude', '/Library,spec']
-Autotest::RCov.pattern = 'spec/**/*_spec.rb'

data/lib/jiveapps/client.rb

@@ -104,7 +104,7 @@ class Jiveapps::Client
   ### OAuth Services
 
   def list_oauth_services(app_name)
-    services = get("/apps/#{app_name}/oauth_services")
+    services = get("/apps/#{escape(app_name)}/oauth_services")
 
     if services.class == Array
       services.map { |item| item['oauth_service'] }
@@ -114,18 +114,18 @@ class Jiveapps::Client
   end
 
   def add_oauth_service(app_name, name, key, secret)
-    post("/apps/#{app_name}/oauth_services", {:oauth_service => {:name => name, :key => key, :secret => secret}})
+    post("/apps/#{escape(app_name)}/oauth_services", {:oauth_service => {:name => name, :key => key, :secret => secret}})
   end
 
   def remove_oauth_service(app_name, name)
-    delete("/apps/#{app_name}/oauth_services/#{name}")
+    delete("/apps/#{escape(app_name)}/oauth_services/#{escape(name)}")
   end
 
   ### Collaborators
 
   # Get a list of collaborators on the app, returns an array of hashes each with :email
   def list_collaborators(app_name)
-    collaborators = get("/apps/#{app_name}/collaborators")
+    collaborators = get("/apps/#{escape(app_name)}/collaborators")
 
     if collaborators.class == Array
       collaborators.map { |item| {:username => item['collaborator']['user']['username']} }
@@ -136,12 +136,12 @@ class Jiveapps::Client
 
   # Invite a person by username to collaborate on the app.
   def add_collaborator(app_name, username)
-    post("/apps/#{app_name}/collaborators", {:collaborator => {:username => username}})
+    post("/apps/#{escape(app_name)}/collaborators", {:collaborator => {:username => username}})
   end
 
   # Remove a collaborator.
   def remove_collaborator(app_name, username)
-    delete("/apps/#{app_name}/collaborators/#{escape(username)}").to_s
+    delete("/apps/#{escape(app_name)}/collaborators/#{escape(username)}").to_s
   end
 
   ### General
@@ -207,16 +207,6 @@ 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::MODE == 'production'
-      _escape(_escape(value))
-    else
-      _escape(value)
-    end
-  end
-
-  def _escape(value)  # :nodoc:
     escaped = URI.escape(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
     escaped.gsub('.', '%2E') # not covered by the previous URI.escape
   end

data/lib/jiveapps/commands/app.rb

@@ -111,7 +111,13 @@ module Jiveapps::Command
         run('git commit -m "initial commit"')
         run("git remote add jiveapps #{current_app['git_url']}")
         run("git push jiveapps master")
-        run("git branch --set-upstream master jiveapps/master")
+
+        # configure master branch to track to remote branch.
+        # was using "git branch --set-upstream master jiveapps/master"
+        # but it is only supported in git 1.7 and higher
+        run("git config branch.master.remote jiveapps")
+        run("git config branch.master.merge refs/heads/master")
+        run("git config push.default tracking")
       end
 
       if $? == 0

data/lib/jiveapps/version.rb

@@ -1,3 +1,3 @@
 module Jiveapps
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jiveapps
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Scott Becker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 Z
+date: 2011-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: The "jiveapps" gem is a set of command line tools for building and hosting Jive App front-ends.