choctop 0.11.1 → 0.12.0

data/lib/choctop/rake_tasks.rb

@@ -0,0 +1,74 @@
+module ChocTop
+  module RakeTasks
+    def define_tasks
+      return unless Object.const_defined?("Rake")
+
+      desc "Build Xcode #{build_type}"
+      task :build => "build/#{build_type}/#{target}/Contents/Info.plist"
+
+      task "build/#{build_type}/#{target}/Contents/Info.plist" do
+        make_build
+      end
+
+      desc "Create the dmg file for appcasting"
+      task :dmg => :build do
+        detach_dmg
+        make_dmg
+        detach_dmg
+        convert_dmg_readonly
+        add_eula
+      end
+
+      desc "Create/update the appcast file"
+      task :feed do
+        make_appcast
+        make_dmg_symlink
+        make_index_redirect
+        make_release_notes
+      end
+
+      desc "Upload the appcast file to the host"
+      task :upload => :feed do
+        upload_appcast
+      end
+
+      task :detach_dmg do
+        detach_dmg
+      end
+
+      task :size do
+        puts configure_dmg_window
+      end
+
+      namespace :version do
+        desc "Display the current version"
+        task :current do
+          puts VersionHelper.new(info_plist_path).to_s
+        end
+
+        namespace :bump do
+          desc "Bump the gemspec by a major version."
+          task :major do
+            VersionHelper.new(info_plist_path) do |version|
+              version.bump_major
+            end
+          end
+
+          desc "Bump the gemspec by a minor version."
+          task :minor do
+            VersionHelper.new(info_plist_path) do |version|
+              version.bump_minor
+            end
+          end
+
+          desc "Bump the gemspec by a patch version."
+          task :patch do
+            VersionHelper.new(info_plist_path) do |version|
+              version.bump_patch
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/choctop/version_helper.rb

@@ -0,0 +1,66 @@
+module ChocTop
+  class VersionHelper
+    attr_accessor :info_plist_path
+    attr_reader :major, :minor, :patch, :build
+  
+    def initialize(info_plist_path)
+      self.info_plist_path = info_plist_path
+      parse_version
+      if block_given?
+        yield self
+        write
+      end
+    end
+  
+    def info_plist
+      @info_plist ||= OSX::NSDictionary.dictionaryWithContentsOfFile(info_plist_path) || {}
+    end
+  
+    def parse_version
+      # http://rubular.com/regexes/10467 -> 3.5.4.a1
+      # http://rubular.com/regexes/10468 -> 3.5.4
+      # regex on nsstring is broken so convert it to a ruby string
+      if info_plist['CFBundleVersion'].to_s =~ /^(\d+)\.(\d+)\.?(\d+)?(?:\.(.*?))?$/
+        @major = $1.to_i
+        @minor = $2.to_i
+        @patch = $3.to_i
+        @build = $4
+      end
+    end
+
+    def bump_major
+      @major += 1
+      @minor = 0
+      @patch = 0
+      @build = nil
+    end
+
+    def bump_minor
+      @minor += 1
+      @patch = 0
+      @build = nil
+    end
+
+    def bump_patch
+      @patch += 1
+      @build = nil
+    end
+
+    def update_to(major, minor, patch, build=nil)
+      @major = major
+      @minor = minor
+      @patch = patch
+      @build = build
+    end
+  
+    def write
+      info_plist['CFBundleVersion'] =  to_s
+      info_plist['CFBundleShortVersionString'] = to_s
+      info_plist.writeToFile_atomically(info_plist_path,true)
+    end
+
+    def to_s
+      [major, minor, patch, build].compact.join('.')
+    end
+  end
+end

data/spec/choctop_spec.rb

@@ -1,46 +1,55 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe ChocTop do
-  attr_reader :choctop
+describe ChocTop::Configuration do
   
   describe "default" do
     before(:each) do
       FileUtils.chdir(File.dirname(__FILE__) + "/../features/fixtures/SampleApp") do
-        @choctop = ChocTop.new
+        @choctop = ChocTop::Configuration.new
       end
     end
 
     it "should get name from Info.plist['CFBundleExecutable']" do
-      choctop.name.should == 'SampleApp'
+      @choctop.name.should == 'SampleApp'
     end
 
     it "should get version from Info.plist['CFBundleVersion']" do
-      choctop.version.should == '0.1.0'
+      @choctop.version.should == '0.1.0'
     end
 
     it "should derive host from Info.plist['SUFeedURL']" do
-      choctop.host.should == 'mocra.com'
+      @choctop.host.should == 'mocra.com'
     end
 
     it "should derive base_url from Info.plist['SUFeedURL']" do
-      choctop.base_url.should == 'http://mocra.com/sample_app'
+      @choctop.base_url.should == 'http://mocra.com/sample_app'
     end
 
     it "should derive appcast_filename from Info.plist['SUFeedURL']" do
-      choctop.appcast_filename.should == 'my_feed.xml'
+      @choctop.appcast_filename.should == 'my_feed.xml'
+    end
+    
+    it "should default the appcast_filename to my_feed.xml" do
+      ChocTop::Configuration.new.appcast_filename.should == 'my_feed.xml'
+    end
+    
+    it "should raise an exception if the base_url is nil" do
+      lambda{
+        ChocTop::Configuration.new.pkg_relative_url
+      }.should raise_error(Exception, "The base url should be set in order to create a sparkle feed. Set the SUFeedURL in your Info.plist.")
     end
   end
   
   describe "add_files" do
     before(:each) do
       FileUtils.chdir(File.dirname(__FILE__) + "/../features/fixtures/SampleApp") do
-        @choctop = ChocTop.new
+        @choctop = ChocTop::Configuration.new
         @choctop.add_file "README.txt", :position => [50, 100]
       end
     end
     
-    it "should have build/Release/SampleApp.app as a file/bundle" do
-      @choctop.files.keys.should be_include('build/Release/SampleApp.app')
+    it "should have target_bundle as a file/bundle" do
+      @choctop.files.keys.should include(:target_bundle)
     end
 
     it "should have README.txt as a file" do
@@ -57,30 +66,10 @@ describe ChocTop do
           @choctop.prepare_files
         end
       end
-
-      it "should have SampleApp.app in build/Release/dmg ready for inclusion in DMG" do
-        FileUtils.chdir(File.dirname(__FILE__) + "/../features/fixtures/SampleApp") do
-          File.should be_exists('build/Release/dmg/SampleApp.app')
-        end
-      end
-      
-      it "should position SampleApp.app at [175, 65]" do
-        @choctop.set_position_of_files.should =~ /set position of item "SampleApp.app" to \{175, 65\}/
-      end
-
-      it "should have README.txt in build/Release ready for inclusion in DMG" do
-        FileUtils.chdir(File.dirname(__FILE__) + "/../features/fixtures/SampleApp") do
-          File.should be_exists('build/Release/dmg/README.txt')
-        end
-      end
-      
+            
       it "should position README.txt at [50, 100]" do
         @choctop.set_position_of_files.should =~ /set position of item "README.txt" to \{50, 100\}/
       end
-
-      it "should render an Applications shortcut" do
-        @choctop.set_position_of_shortcuts.should =~ /applications_folder/
-      end
     end
 
   end
@@ -93,19 +82,13 @@ describe ChocTop do
       `touch #{File.join(@my_project_path, 'README.txt')}`
       `touch #{File.join(@my_project_path, 'some_other_file.txt')}`
       FileUtils.chdir(@my_project_path) do
-        @choctop = ChocTop.new
+        @choctop = ChocTop::Configuration.new
         @choctop.add_file "README.txt", :position => [50, 100]
         @choctop.add_file "some_other_file.txt", :position => [50, 150]
         @choctop.prepare_files
       end
     end
     
-    it "should have README.txt in build/Release/dmg ready for inclusion in DMG" do
-      FileUtils.chdir(@my_project_path) do
-        File.should be_exists('build/Release/dmg/README.txt')
-      end
-    end
-
     it "should not render an Applications shortcut" do
       @choctop.set_position_of_shortcuts.should_not =~ /applications_folder/
     end

metadata

@@ -1,58 +1,103 @@
 --- !ruby/object:Gem::Specification 
 name: choctop
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  hash: 47
+  prerelease: false
+  segments: 
+  - 0
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Dr Nic Williams
 - Chris Bailey
+- Patrick Huesler
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 +10:00
+date: 2010-05-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: newgem
+  name: rubyforge
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: newgem
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id005
 description: "Build and deploy tools for Cocoa apps using Sparkle for distributions and upgrades; \n\
   it\xE2\x80\x99s like Hoe but for Cocoa apps.\n\n\
   Package up your OS X/Cocoa applications into Custom DMGs, generate Sparkle XML, and\n\
@@ -62,10 +107,11 @@ description: "Build and deploy tools for Cocoa apps using Sparkle for distributi
   The main feature is a powerful rake task \"rake appcast\" which builds a release of your\n\
   application, creates a DMG package, generates a Sparkle XML file, and posts the package\n\
   and XML file to your remote host via rsync.\n\n\
-  All rake tasks:\n\n    rake appcast         # Create dmg, update appcast file, and upload to host\n    rake build   # Build Xcode Release\n    rake dmg     # Create the dmg file for appcasting\n    rake feed    # Create/update the appcast file\n    rake upload  # Upload the appcast file to the host"
+  All rake tasks:\n    rake build               # Build Xcode Release\n    rake dmg                 # Create the dmg file for appcasting\n    rake feed                # Create/update the appcast file\n    rake upload              # Upload the appcast file to the host\n    rake version:bump:major  # Bump the gemspec by a major version.\n    rake version:bump:minor  # Bump the gemspec by a minor version.\n    rake version:bump:patch  # Bump the gemspec by a patch version.\n    rake version:current     # Display the current version"
 email: 
 - drnicwilliams@gmail.com
 - chris@cobaltedge.com
+- patrick.huesler@gmail.com
 executables: 
 - install_choctop
 extensions: []
@@ -106,6 +152,8 @@ files:
 - lib/choctop.rb
 - lib/choctop/appcast.rb
 - lib/choctop/dmg.rb
+- lib/choctop/rake_tasks.rb
+- lib/choctop/version_helper.rb
 - script/console
 - script/destroy
 - script/generate
@@ -124,21 +172,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: choctop
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Build and deploy tools for Cocoa apps using Sparkle for distributions and upgrades;  it\xE2\x80\x99s like Hoe but for Cocoa apps"