juretta-ipt 1.3.0 → 1.3.1

data/README.md

@@ -18,7 +18,7 @@ Installation
 		require 'rubygems'
 		gem 'juretta-ipt'
 		load 'iphone_tools.rake'
-	
+
 Rake tasks
 ==========
 
@@ -107,7 +107,27 @@ to list TODO|FIXME|IMPROVE markers in the source code.
 Easily create AdHoc distribution builds.
 ---------------------------------------
 
-**More documentation needed.**
+The ipt:adhoc:* tasks make it very easy to create proper adhoc builds that can be distributed as tar.gz archive files. The archive contains the iPhone Application, the AdHoc provisioning profile and a changelog .txt file that contains the latest changes.
+
+The archive file can be easily distributed and allows beta tester/clients/developers to install a snapshot or development release.
+
+I usually use the following directory laout when working on iPhone projects:
+
+	Main project directory:
+		./releases			This is where the AdHoc releases end up
+			1.0.1.tgz
+			1.0.2.tgz
+		./xcode-project		The Xcode project.
+			Classes
+			build
+			Rakefile
+			...
+			
+The AdHoc builds are based on git tags representing the current version of the software.
+
+	rake ipt:adhoc:release 
+	
+	rake ipt:adhoc:snapshot
 
 Xcode and git
 =============
@@ -198,7 +218,7 @@ executable.
 	raise "Must be run from Xcode" unless ENV['XCODE_VERSION_ACTUAL']
 	
 	GIT="/opt/local/bin/git"
-	PLIST_FILE = File.join(ENV['BUILT_PRODUCTS_DIR'], ENV['WRAPPER_NAME'], 'Info.plist')
+	PLIST_FILE = File.join(ENV['BUILT_PRODUCTS_DIR'], ENV['INFOPLIST_PATH'])
 	
 	if File.file?(PLIST_FILE)
 	  pl = Plist::parse_xml(PLIST_FILE)

data/lib/ipt/plist.rb

@@ -1,6 +1,8 @@
+require 'Plist'
+
 module IPT
 
-  module Plist
+  module Propertylist
     class Parser
       def initialize(path)
         if File.file?(path)
@@ -10,7 +12,7 @@ module IPT
       end
       
       def parse
-        Plist::parse_xml(@xml) if @xml
+        ::Plist::parse_xml(@xml) if @xml
       end
     end
   end

data/lib/ipt/tag_extraction.rb

@@ -23,7 +23,7 @@ module IPT
           match = false
         end
       end
-      output.join("\n")      
+      output.empty? ? "#{pattern} not found" : output.join("\n")      
     end
     
     def traverse

data/tasks/iphone_tools.rake

@@ -127,7 +127,7 @@ namespace :ipt do
       end # end with
       Dir["#{BUILD_DIR}/**/Info.plist"].each do |path|
         if File.file?(path)
-          pl = IPT::Plist::Parser.new(path).parse
+          pl = IPT::Propertylist::Parser.new(path).parse
           if pl
             puts "File: #{path}"
             puts "CFBundleVersion: #{pl['CFBundleVersion']}".strip

data/test/fixtures/tag_1.rb

@@ -0,0 +1,3 @@
+class Junk
+  # TODO implement the Junk class
+end

data/test/rake_helper_test.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+module RakeHelper
+  public :resolve_previous_version
+end
+
+class VersionTest < Test::Unit::TestCase
+  
+  include RakeHelper
+  include IPT
+  
+  context "A valid list of version" do   
+    should "result in a valid previous version" do
+      tags = ["0.2.0", "0.2.10", "0.2.11", "0.2.12", "0.2.13", "0.2.3", 
+        "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.9.0", 
+        "0.9.1", "0.9.2", "0.9.3", "0.9.4", "1.1.0", "1.1.1", "1.1.2", 
+        "2.0.0", "stefan-RC1"]
+      
+      current = Version.new(0, 2, 10)
+      
+      prev = resolve_previous_version(tags, current)
+      assert_equal prev, Version.new(0, 2, 9)
+      
+      current = Version.new(1, 1, 1)
+      prev = resolve_previous_version(tags, current)
+      assert_equal prev, Version.new(1, 1, 0)
+      
+      current = Version.new(0, 2, 0)
+      prev = resolve_previous_version(tags, current)
+      assert_nil prev
+      
+      current = Version.new(2, 0, 0)
+      prev = resolve_previous_version(tags, current)
+      assert_equal prev, Version.new(1, 1, 2)
+    end
+  end
+
+end
+

data/test/tag_extraction_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+
+module IPT
+  class TagExtraction
+    def traverse
+      Dir["#{FIXTURES_DIR}/tag_*"].each do |f|
+        yield f
+      end
+    end
+  end
+end
+
+class TagExtractionTest < Test::Unit::TestCase
+  
+  include IPT
+  
+  context "Marker tags" do   
+    setup do
+      @te = TagExtraction.new
+    end
+  
+    should "be recognized" do
+      out = @te.grep(/TODO|FIXME|IMPROVE/i)
+      assert_match "TODO implement the Junk class", out
+      assert_match "IMPROVE: Needs more text.", out      
+    end      
+  end  
+end
+

data/test/test_helper.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+require 'mocha'
+
+FIXTURES_DIR = File.join(File.dirname(__FILE__), 'fixtures')
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'ipt'
+
+class Test::Unit::TestCase
+end

data/test/version_test.rb

@@ -0,0 +1,223 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class VersionTest < Test::Unit::TestCase
+  
+  include IPT
+  
+  context "A valid version string" do   
+    should "be parsed into a version instance" do
+
+      version = Version.parse("1")
+      assert_not_nil version
+      assert_equal 1, version.major
+      assert_nil version.minor
+      assert_nil version.patch
+      assert_nil version.build
+      
+      version = Version.parse("1.0")
+      assert_not_nil version
+      assert_equal 1, version.major
+      assert_equal 0, version.minor
+      assert_nil version.patch
+      assert_nil version.build      
+    
+      version = Version.parse("1.0.6")
+      assert_not_nil version
+      assert_equal 1, version.major
+      assert_equal 0, version.minor
+      assert_equal 6, version.patch
+      assert_nil version.build
+      
+      version = Version.parse("1.0.6.300")
+      assert_not_nil version
+      assert_equal 1, version.major
+      assert_equal 0, version.minor
+      assert_equal 6, version.patch
+      assert_equal 300, version.build    
+      
+      assert_equal "1.0.6.300", "#{version}"
+      assert_equal "1.0.6.300", version.to_s  
+    end
+  end
+  
+  context "An invalid version string" do   
+    should "be reported as InvalidArgument" do
+      assert_raise(ArgumentError) do 
+        Version.parse("A")
+      end
+      assert_raise(ArgumentError) do 
+        Version.parse("")
+      end
+      assert_raise(ArgumentError) do 
+        Version.parse(nil)
+      end
+      assert_raise(ArgumentError) do 
+        Version.parse("stefan-RC1")
+      end
+    end
+  end  
+  
+  context "A valid version instance" do  
+    
+    setup do
+      @version = Version.new(1, 2, 3, 100)
+      assert_equal 1, @version.major
+      assert_equal 2, @version.minor
+      assert_equal 3, @version.patch
+      assert_equal 100, @version.build                  
+    end
+
+    should "provide a proper to_s method" do
+      assert_equal "1.2.3.100", @version.to_s
+      assert_equal "1.2.3", Version.new(1, 2, 3).to_s
+      assert_equal "1.2.0", Version.new(1, 2, 0).to_s
+    end
+
+    should "increase the least significant part properly" do      
+      # Default :major
+      v = @version.increase!
+      assert_not_nil v
+      assert_equal 101, v.build
+    end
+
+    should "increase the major part properly" do      
+      # Default :major
+      v = @version.increase!(:major)
+      assert_not_nil v
+      assert_equal 2, @version.major
+      assert_equal 2, v.major      
+    end  
+    
+    should "increase the minor part properly" do      
+      # Default :major
+      v = @version.increase!(:minor)
+      assert_not_nil v
+      assert_equal 3, @version.minor
+      assert_equal 3, v.minor      
+    end 
+    
+    should "increase the patch part properly" do      
+      # Default :major
+      v = @version.increase!(:patch)
+      assert_not_nil v
+      assert_equal 4, @version.patch
+      assert_equal 4, v.patch      
+    end         
+    
+    should "increase the build part properly" do      
+      # Default :major
+      v = @version.increase!(:build)
+      assert_not_nil v
+      assert_equal 101, @version.build
+      assert_equal 101, v.build      
+    end         
+    
+    should "decrease the least significant part properly" do      
+      # Default :major
+      v = @version.decrease!
+      assert_not_nil v
+      assert_equal 99, v.build
+    end
+    
+    should "decrease the major part properly" do      
+      # Default :major
+      v = @version.decrease!(:major)
+      assert_not_nil v
+      assert_equal 0, @version.major
+      assert_equal 0, v.major      
+    end  
+    
+    should "decrease the minor part properly" do      
+      # Default :major
+      v = @version.decrease!(:minor)
+      assert_not_nil v
+      assert_equal 1, @version.minor
+      assert_equal 1, v.minor      
+    end 
+    
+    should "decrease the patch part properly" do      
+      # Default :major
+      v = @version.decrease!(:patch)
+      assert_not_nil v
+      assert_equal 2, @version.patch
+      assert_equal 2, v.patch      
+    end         
+    
+    should "decrease the build part properly" do      
+      # Default :major
+      v = @version.decrease!(:build)
+      assert_not_nil v
+      assert_equal 99, @version.build
+      assert_equal 99, v.build      
+    end
+    
+    should "return valid values for <=>" do
+      v1 = Version.new(1, 0, 0)
+      assert_nil v1 <=> nil
+      assert_nil v1 <=> 1
+    end
+    
+    should "return valid values for eql?" do
+      v1 = Version.new(1, 0, 0)
+      v1b = Version.new(1, 0, 0)
+      v2 = Version.new(1, 0, 1)
+      assert_equal false, v1.eql?(v2)
+      
+      assert_equal false, v1.eql?(nil)
+      assert_equal false, v1.eql?("1.0.0")
+            
+      assert v1.eql?(v1b)
+    end
+    
+    should "be comparable to another version" do
+      assert_equal 0, @version <=> @version
+      assert_equal false, @version > @version
+      assert_equal false, @version < @version
+      
+      v1 = Version.new(1, 0, 0)
+      v2 = Version.new(2, 0, 0)
+      assert v1 < v2
+      assert v2 > v1
+      assert v1 != v2
+      
+      v1 = Version.new(1, 0, 0)
+      v2 = Version.new(1, 0, 1)
+      assert v1 < v2
+      assert v2 > v1
+      assert v1 != v2
+      
+      v1 = Version.new(1, 0, 99)
+      v2 = Version.new(2, 0, 0)
+      assert v1 < v2
+      assert v2 > v1
+      assert v1 != v2
+      
+      v1 = Version.new(1, 0, 99)
+      v2 = Version.new(1, 0, 101)
+      assert v1 < v2
+      assert v2 > v1
+      assert v1 != v2
+      
+      v1 = Version.new(0, 0, 99)
+      v2 = Version.new(0, 0, 101)
+      assert v1 < v2
+      assert v2 > v1
+      assert v1 != v2
+      
+      v1 = Version.new(0, 0, 99)
+      v2 = Version.new(0, 1, 98)
+      assert v1 < v2
+      assert v2 > v1
+      assert v1 != v2
+      
+      v1 = Version.new(0, 0, 99)
+      v2 = Version.new(0, 0, 99, 2)
+      assert v1 < v2
+      assert v2 > v1
+      assert v1 != v2
+    end
+
+    
+  end  
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: juretta-ipt
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Stefan Saasen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,13 +22,12 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- lib/ipt
+- lib/ipt.rb
 - lib/ipt/plist.rb
 - lib/ipt/rake_helper.rb
 - lib/ipt/readme.rb
 - lib/ipt/tag_extraction.rb
 - lib/ipt/version.rb
-- lib/ipt.rb
 - tasks/changelog.tmpl
 - tasks/gitignore.tmpl
 - tasks/iphone_tools.rake
@@ -38,7 +37,6 @@ has_rdoc: true
 homepage: http://github.com/juretta/iphone-project-tools
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -62,5 +60,9 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Useful rake tasks and scripts for iPhone development using Xcode.
-test_files: []
-
+test_files: 
+- test/fixtures/tag_1.rb
+- test/rake_helper_test.rb
+- test/tag_extraction_test.rb
+- test/test_helper.rb
+- test/version_test.rb