jiveapps 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.7 2012-10-08
+* Bug Fixes:
+  * Handle checking git version when git returns a custom Apple version string
+
 === 1.0.6 2012-02-08
 * Enhancements
   * ADT-26: Prompt to delete files and delete if so

data/jiveapps.gemspec

@@ -42,7 +42,6 @@ Other features:
   s.add_dependency 'systemu',           '2.2.0'
 
   s.add_development_dependency 'rspec',   '>= 2.2.0'
-  s.add_development_dependency 'rcov',    '>= 0.9.9'
   s.add_development_dependency 'webmock', '>= 1.6.1'
 
   s.files         = `git ls-files`.split("\n")

data/lib/jiveapps/helpers.rb

@@ -118,10 +118,14 @@ module Jiveapps
       end
     end
 
+    def git_version
+      `git --version`
+    end
+
     def user_git_version
       return @git_version if @git_version
       error("Git not found. Please install Git 1.7 or higher. http://git-scm.com/download") unless has_program?("git")
-      version_string = `git --version`.split(/\s+/).last
+      version_string = git_version[/\d{1,2}\.\d{1,2}/]
       @git_version = Gem::Version.new(version_string)
     end
 

data/lib/jiveapps/version.rb

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

data/spec/helper_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Jiveapps::Helpers do
+
+  class Temp
+    include Jiveapps::Helpers
+  end
+
+  describe "user git version" do
+    it "handles normal git version string" do
+      @obj = Temp.new
+      @obj.stub(:git_version).and_return("git version 1.7.9.6 (Apple Git-31.1)")
+      @obj.user_git_version.should == Gem::Version.new("1.7")
+    end
+
+    it "handles apple-specific git version string" do
+      @obj = Temp.new
+      @obj.stub(:git_version).and_return("git version 1.7.11.3")
+      @obj.user_git_version.should == Gem::Version.new("1.7")
+    end
+  end
+
+end

metadata

@@ -1,183 +1,180 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jiveapps
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.0.7
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 6
-  version: 1.0.6
 platform: ruby
-authors: 
+authors:
 - Scott Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: directory_watcher
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+- !ruby/object:Gem::Dependency
+  name: directory_watcher
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rubigen
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: rubigen
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 5
-        - 5
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.5.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: systemu
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+- !ruby/object:Gem::Dependency
+  name: systemu
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
   name: webmock
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :development
-  version_requirements: *id008
-description: |+
-  == Jiveapps
-  
-  These tools are all about making Jive App development as easy as possible. After you install the tools, it only takes a single command to:
-  
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+description: ! '== Jiveapps
+
+
+  These tools are all about making Jive App development as easy as possible. After
+  you install the tools, it only takes a single command to:
+
+
   1. Create a new app - a simple Hello World application.
+
   2. Set up version control for your code using Git.
-  3. Host the app code online at Jive's AppHosting server.
+
+  3. Host the app code online at Jive''s AppHosting server.
+
   4. Register the app on the Jive Apps Marketplace as an app "in development".
+
   5. Install the app on your default app dashboard in the Jive Apps Sandbox.
-  
-  After you install, use this simple workflow to make changes and see them reflected in the sandbox:
-  
+
+
+  After you install, use this simple workflow to make changes and see them reflected
+  in the sandbox:
+
+
   1. Make a change to the code on your local machine.
+
   2. Commit the changes to your local Git repository.
-  3. Push the changes to the remote Jive Apps repository. This automatically updates the hosted copy on the Jive AppHosting server.
-  4. Refresh the app dashboard or canvas page on the Jive Apps Sandbox and see your changes.
-  
+
+  3. Push the changes to the remote Jive Apps repository. This automatically updates
+  the hosted copy on the Jive AppHosting server.
+
+  4. Refresh the app dashboard or canvas page on the Jive Apps Sandbox and see your
+  changes.
+
+
   Other features:
-  
+
+
   * LiveDev: preview your changes on the Jive App Sandbox in real time
+
   * Collaboration: add other developers to your project
-  * OAuth Key Management: associate consumer key/secret pairs with service names for use in your apps
-  
-email: 
+
+  * OAuth Key Management: associate consumer key/secret pairs with service names for
+  use in your apps
+
+
+'
+email:
 - becker.scott@gmail.com
-executables: 
+executables:
 - jiveapps
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -222,39 +219,41 @@ files:
 - spec/commands/livedev_spec.rb
 - spec/commands/oauth_spec.rb
 - spec/commands/sharing_spec.rb
+- spec/helper_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jivesoftware/jiveapps-gem
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 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: []
-
+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/helper_spec.rb
+- spec/spec_helper.rb