juretta-ipt 1.1.0 → 1.2.0

data/README.md

@@ -18,18 +18,6 @@ Installation
 		require 'rubygems'
 		gem 'juretta-ipt'
 		load 'iphone_tools.rake'
-
-CLANG
------
-If you want to use the static code analysis task (highly recommended). You have to download the checker binary.
-
-	stefan@macbook-pro-2:~/temp$ curl -OL http://keeda.stanford.edu/~kremenek/checker/checker-107.tar.bz2
-	stefan@macbook-pro-2:~/temp$ tar xjf checker-107.tar.bz2 -C /Users/stefan/dev/iphone/clang
-
-Add the path to the extracted directory to your PATH environment variable. E.g. in ~/.bash_profile
-
-	export CLANG=/Users/stefan/dev/iphone/clang/checker-107
-	export PATH=$PATH:$CLANG
 	
 Rake tasks
 ==========
@@ -58,6 +46,16 @@ to show the available tasks:
 Static code analysis
 --------------------
 
+If you want to use the static code analysis task (highly recommended). You have to download the checker binary.
+
+	stefan@macbook-pro-2:~/temp$ curl -OL http://keeda.stanford.edu/~kremenek/checker/checker-107.tar.bz2
+	stefan@macbook-pro-2:~/temp$ tar xjf checker-107.tar.bz2 -C /Users/stefan/dev/iphone/clang
+
+Add the path to the extracted directory to your PATH environment variable. E.g. in ~/.bash_profile
+
+	export CLANG=/Users/stefan/dev/iphone/clang/checker-107
+	export PATH=$PATH:$CLANG
+
  > The LLVM/Clang static analyzer is a standalone tool that find bugs in C and Objective-C programs.
 
 Run 'rake ipt:analyze' to run the clang checker. The output of the analyzer is 
@@ -69,9 +67,6 @@ Please visit the [LLVM/Clang homepage](http://clang.llvm.org/StaticAnalysis.html
 about the "Clang checker". 
 You should probably read the [Recommended Usage Guidelines](http://clang.llvm.org/StaticAnalysisUsage.html#RecommendedUsageGuidelines).
 
-To run the code analysis run:
-    rake ipt:analyze
-
 
 Generate HTML-Readme files
 --------------------------
@@ -93,15 +88,27 @@ Supported formats:
 [4]: http://textism.com/tools/textile/
 [5]: http://rdoc.sourceforge.net/doc/
 
-Unit testing with rbiphonetest
-------------------------------
 
-This is not included in this Rakefile. Have a look at [rbiphonetest][6] if you want to easily test your Foundation classes.
-The rbiphonetest git repository lives here: [http://github.com/drnic/rbiphonetest/tree/master](http://github.com/drnic/rbiphonetest/tree/master)
+List (TODO|FIXME) Markers in your source code files
+---------------------------------------------------
 
-[6]: http://drnicwilliams.com/2008/07/04/unit-testing-iphone-apps-with-ruby-rbiphonetest/
+Suppose you added a TODO marker in one of your classes.
+
+Run
+
+ 	rake ipt:todo
+
+to list TODO|FIXME|IMPROVE markers in the source code.
+
+ 	Classes/DomainSearch.m
+      	95:  // TODO: Do we need a custom NSAutoreleasePool??
 
 
+Easily create AdHoc distribution builds.
+---------------------------------------
+
+**More documentation needed.**
+
 Xcode and git
 =============
 
@@ -115,10 +122,16 @@ Run the
 task to generate an HTML and XMl changelog file in the 'doc' subdirectory in your Xcode project directory.
 The updated changelog files will be added and commited to your local git repository automatically.
 
-Xcode git .gitignore
---------------------
-Copy the following lines into your PROJECT_DIR/.gitignore file to ignore Xcode build artifacts and
-user specific settings:
+Xcode specific .gitignore
+-------------------------
+
+The
+
+	rake ipt:git:ignore
+	
+target either creates a new .gitignore file in your project directory or
+adds the following lines to your existing .gitignore file (but only if the are not already in there):
+
 
     build
     *.mode1v3
@@ -130,6 +143,8 @@ user specific settings:
     *.perspective
     *.perspectivev3
 
+git now will ignore Xcode build artifacts and user specific settings.
+
 Xcode git build number script
 -----------------------------
 
@@ -192,4 +207,14 @@ executable.
 	    pl.save_plist(PLIST_FILE)
 	  end
 	end
-	
+
+Useful Tools
+============
+
+rbiphonetest
+------------
+
+Have a look at [rbiphonetest][6] if you want to easily test your Foundation classes. The rbiphonetest git repository lives here: [http://github.com/drnic/rbiphonetest/tree/master](http://github.com/drnic/rbiphonetest/tree/master)
+
+[6]: http://drnicwilliams.com/2008/07/04/unit-testing-iphone-apps-with-ruby-rbiphonetest/
+

data/lib/ipt/rake_helper.rb

@@ -27,4 +27,29 @@ module RakeHelper
     last_tag = last_tag.split('-').first if last_tag =~ /-/  
     IPT::Version.parse(last_tag)
   end
+  
+  def get_previous_version(current_version)
+    tags = `#{GIT} tag -l`.split("\n")
+    resolve_previous_version(tags, current_version)
+  end
+  
+  
+  private
+    def resolve_previous_version(tags, current_version)
+      versions = tags.inject([]) do |v, tag|
+        begin
+          version = IPT::Version.parse(tag)
+          v << version
+        rescue => e
+          # ignore - there might be other tags we are not interested in
+        end
+        v
+      end
+      versions.compact!
+      versions.sort!
+      
+      idx = versions.index(current_version)
+      return nil unless idx && idx > 0
+      versions[idx-1]
+    end
 end

data/lib/ipt/version.rb

@@ -15,9 +15,12 @@ module IPT
   #
   #  puts version # => "2.3.9"
   class Version
+    
+    include Comparable
+    
     class << self
       def parse(str)
-        raise ArgumentError.new("Invalid version string: #{str}") unless str && str =~ /[0-9]+(\.[0-9]+)?/
+        raise ArgumentError.new("Invalid version string: #{str}") unless str && str =~ /^[0-9]+(\.[0-9]+)?/
         Version.new(*str.split("."))
       end
     end
@@ -39,7 +42,35 @@ module IPT
     end
     
     def to_s
-      PARTS.map{|part| self.send(part)}.join('.')
+      PARTS.map{|part| self.send(part)}.compact.join('.')
+    end
+    
+    def ==(other)
+      return false unless other.is_a?(IPT::Version)
+      PARTS.each do |part|
+        return false unless self.send(part).eql?(other.send(part))
+      end
+      true
+    end
+    
+    def eql?(other)
+      self == other
+    end
+    
+    # Comparable
+    def <=>(other)
+      return nil unless other
+      PARTS.each do |part|
+        return nil unless other.respond_to?(part)
+        vo = other.send(part)
+        so = self.send(part)
+        return -1 if so.nil? && vo
+        return 1 if vo.nil? && so
+        return 0 if vo.nil? && so.nil?
+        c = (so <=> vo)
+        return c unless c == 0
+      end
+      0
     end
     
     private

data/tasks/gitignore.tmpl

@@ -0,0 +1,9 @@
+build
+*.mode1v3
+*.mode2v3
+*.nib
+.DS_Store
+*.swp
+*.pbxuser
+*.perspective
+*.perspectivev3

data/tasks/iphone_tools.rake

@@ -40,7 +40,7 @@ namespace :ipt do
   
   namespace :adhoc do
     #desc "Create an AdHoc distriution build"
-    task :build => :prepare do
+    task :build do
       rm_r BUILD_DIR if File.directory?(BUILD_DIR)
       target = find_current_project_name
       sh "xcodebuild -target '#{target}' -configuration '#{ADHOC_CONFIGURATION_NAME}'"
@@ -53,10 +53,11 @@ namespace :ipt do
     
     # The Adhoc build depends on git
     with('git') do
-      #desc "Prepare a release"
-      task :prepare => :inject do
+      
+      desc "Prepare next version by incrementing the current tag"
+      task :tag_next_version => :inject do
         last_tag = resolve_tag
-        puts "Previous tag: #{last_tag}"
+        puts "Current tag: #{last_tag}"
         NEW_TAG = last_tag.increase!.to_s
         puts "New tag/version: #{NEW_TAG}"
 
@@ -78,8 +79,8 @@ namespace :ipt do
         `#{GIT} tag -a -m "Preparing release for version '#{NEW_TAG}'." #{NEW_TAG}`
       end
       
-      desc "Create an Ad-Hoc bundle in #{RELEASES_DIR} based on the current git tag"
-      task :release => :build do
+      desc "Create an AdHoc bundle in in #{RELEASES_DIR} based on the current tag"
+      task :snapshot => :build do
         target = find_current_project_name
         src = File.join(BUILD_DIR, "#{ADHOC_CONFIGURATION_NAME}-iphoneos", "#{target}.app")
         raise "Release build does not exist" unless File.directory?(src)
@@ -90,7 +91,7 @@ namespace :ipt do
         mkdir_p path
         
         current_tag = resolve_tag
-        previous_tag = current_tag.dup.decrease!
+        previous_tag = get_previous_version(current_tag)
 
         puts "Creating changelog.txt (#{previous_tag} -> #{current_tag})"
 
@@ -105,6 +106,11 @@ namespace :ipt do
         puts 'Creating tar.gz'
         `tar czf #{RELEASES_DIR}/#{dir_name}.tgz -C #{path} .`
       end
+            
+      desc "Create a new version tag and build/archive an Ad-Hoc bundle in #{RELEASES_DIR}"
+      task :release => [:tag_next_version, :build, :snapshot] do
+        #
+      end
     end
     
   end
@@ -179,7 +185,28 @@ namespace :ipt do
     namespace :git do
       desc "Create a .gitignore file or add XCode related ignore pattern to your existing .gitignore file."
       task :ignore do
-        raise "Implement"
+        IGNORE_FILE = File.join(Dir.pwd, ".gitignore").freeze
+        ignore_lines_to_add = IO.readlines(File.join(File.dirname(__FILE__), 'gitignore.tmpl')).map{|line| line.strip}
+        if File.file?(IGNORE_FILE)
+          puts "\tAbout to add ignore lines to existing .gitignore file"
+          existing_lines = IO.readlines(IGNORE_FILE).map{|line| line.strip}
+          diff = ignore_lines_to_add - existing_lines
+          p diff if $DEBUG
+          if diff.empty?
+            puts "\tThe existing .gitgnore file already contains all the necessary lines. Not changing .gitignore."
+          else
+            puts "\tAdding #{diff.size} entry/entries:\n"
+            print diff.map{|line| "\t\t* #{line}\n"}
+            File.open(IGNORE_FILE, "a") do |f|
+              f << diff.join("\n")
+            end
+          end
+        else
+          puts "\tCreating a new .gitignore file"
+          File.open(IGNORE_FILE, "w") do |f|
+            f << ignore_lines_to_add.join("\n")
+          end
+        end
       end
     
       desc "Create a changelog (doc/changelog.html and doc/changelog.xml) based on your git commits."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: juretta-ipt
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Stefan Saasen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -08:00
+date: 2009-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/ipt/version.rb
 - lib/ipt.rb
 - tasks/changelog.tmpl
+- tasks/gitignore.tmpl
 - tasks/iphone_tools.rake
 - tasks/rakefile.tmpl
 - README.md