ios-box 0.2.3 → 0.2.4

data/lib/ios-box.rb

@@ -1,3 +1,3 @@
 module IOSBox
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/ios-box/iosbox.rb

@@ -53,9 +53,16 @@ module IOSBox
     end
 
     def git
-      @git ||= Grit::Repo.new(project_dir)
+      @git ||= Grit::Repo.new(git_dir)
+    end
+    
+    def git_dir
+      if File.exists?(File.join(project_dir, ".git"))
+        project_dir
+      else
+        %x{git rev-parse --show-toplevel}.strip
+      end
     end
-
 
     class Version
       attr_reader :iosbox

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ios-box
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70165439353500 !ruby/object:Gem::Requirement
+  requirement: &70253808104160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165439353500
+  version_requirements: *70253808104160
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70165439352880 !ruby/object:Gem::Requirement
+  requirement: &70253808103240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165439352880
+  version_requirements: *70253808103240
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70165439352280 !ruby/object:Gem::Requirement
+  requirement: &70253808102420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165439352280
+  version_requirements: *70253808102420
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70165439351660 !ruby/object:Gem::Requirement
+  requirement: &70253808101540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165439351660
+  version_requirements: *70253808101540
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70165439350880 !ruby/object:Gem::Requirement
+  requirement: &70253808100340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165439350880
+  version_requirements: *70253808100340
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70165439350360 !ruby/object:Gem::Requirement
+  requirement: &70253808099700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165439350360
+  version_requirements: *70253808099700
 description: Include atuomatic vesion conrol for you XCode projects.
 email:
 - mikko@owlforestry.com
@@ -108,7 +108,6 @@ files:
 - lib/ios-box/tools/config.rb
 - lib/ios-box/tools/deploy.rb
 - lib/ios-box/tools/version.rb
-- lib/ios_box.rb
 - spec/build_cache_spec.rb
 - spec/ios-box_spec.rb
 - spec/spec_helper.rb

data/lib/ios_box.rb

@@ -1,271 +0,0 @@
-require 'rake/tasklib'
-require 'pbxproject'
-require 'yaml'
-require 'ostruct'
-require 'grit'
-require 'plist'
-
-require 'build_cache'
-
-module IOSBox
-  class Tasks < ::Rake::TaskLib
-    def initialize(namespace = :iosbox, &block)
-      @config = Config.new(
-        :configuration => "Adhoc",
-        :build_style => :months,
-        :bundle_version_style => "V.b",
-        :buildCache => ".buildCache"
-      )
-      yield @config
-      
-      # Load build cache
-      @buildCache = BuildCache.load(@config.buildCache) || BuildCache.new
-      @buildCache.init(@config)
-      
-      @namespace = namespace
-      define
-    end
-    
-    class Config < OpenStruct
-      def initialize args
-        super
-        # Do we have XCode environment?
-        if (ENV['XCODE_VERSION_ACTUAL'])
-          self.project_dir = ENV['PROJECT_DIR']
-          self.infoplist_file = ENV['INFOPLIST_FILE']
-          self.plist = File.join(self.project_dir, self.infoplist_file)
-          # Else delay variable initialization until we have build cache
-        end
-      end
-    end
-    
-    private
-
-    def define
-      # General namespace
-      namespace(@namespace) do
-        desc "Integrates IosBox to XCode build phases"
-        task :integrate do
-          # Get our xcodeproject from config or find it
-          xcode = @config.project || Dir["*.xcodeproj"].first
-          
-          raise "Cannot find project.pbxproj in #{xcode}" unless File.file? "#{xcode}/project.pbxproj"
-          pbx = PBXProject::PBXProject.new :file => "#{xcode}/project.pbxproj"
-          pbx.parse
-          
-          # Add build:prepare task to build phases
-          initPhase = PBXProject::PBXTypes::PBXShellScriptBuildPhase.new :shellPath => '/bin/sh', :shellScript => "\"(cd $PROJECT_DIR; rake #{@namespace}:build:prepare)\""
-          pbx.add_item initPhase
-          
-          # Add to target
-          target = pbx.find_item :name => @config.target, :type => PBXProject::PBXTypes::PBXNativeTarget
-          target.add_build_phase initPhase, 0
-          
-          # Fix DevelopmentRegion
-          project = pbx.find_item :type => PBXProject::PBXTypes::PBXProject
-          project[0].developmentRegion = "en"
-          
-          # Save our project file
-          pbx.write_to :file => "#{xcode}/project.pbxproj"
-        end
-        
-        # Version mungle
-        desc "Returns current version string"
-        task :version do
-          @plist = Plist::parse_xml(@config.plist)
-          @config._short_version = @plist["CFBundleShortVersionString"]
-          @config._bundle_version = @plist["CFBundleVersion"]
-          
-          # Check if we have defined new version number in XCode
-          if (@plist["CFBundleShortVersionString"] != @plist["CFBundleVersion"])
-            # Do we have human version number?
-            if (m = @plist["CFBundleVersion"].match(/(\d+)\.(\d{1,2})(\.(\d+))?$/))
-              ver_str = "%d.%d%s" % [ m[1], m[2], m[4] ? ".#{m[4]}" : "" ]
-              @plist['CFBundleShortVersionString'] = ver_str
-              @plist.save_plist(@config.plist)
-              puts "Version string updated."
-              @config._short_version = @config._bundle_version
-            end
-          end
-          
-          puts " Short Version: #{@config._short_version}"
-        end
-        
-        namespace :version do
-          @ver = {:major => nil, :minor => nil, :patch => nil}
-          def _prepare
-            if (@config.project_dir.nil? || @config.plist.nil?)
-              raise "Cannot find project dir and/or Info.plist. Aither not running from XCode or missing buildCache."
-            end
-            
-            @git = Grit::Repo.new("#{@config.project_dir}")
-            @config._commit = @git.commit("HEAD").id_abbrev
-            
-            @plist = Plist::parse_xml(@config.plist)
-            if (m = @plist["CFBundleShortVersionString"].match(/(\d+)\.(\d+)(\.(\d+))?/))
-              @ver[:major] = Integer(m[1]) if m[1]
-              @ver[:minor] = Integer(m[2]) if m[2]
-              @ver[:patch] = Integer(m[4]) if m[4]
-            end
-          end
-          
-          def _write_back
-            @plist = Plist::parse_xml(@config.plist) unless @plist
-            ver_str = "%d.%d%s" % [ @ver[:major], @ver[:minor], @ver[:patch] ? ".#{@ver[:patch]}" : "" ]
-            @plist["CFBundleShortVersionString"] = ver_str # Human redable version string
-            @plist["CFBundleVersion"] = ver_str # XCode uses this version, we override this in prebuild
-            @plist.save_plist(@config.plist)
-          end
-  
-          desc "Generates Bundle Version"
-          task :bundlever => ["version", "version:buildnum"] do
-            # Build our components
-            comp = {
-              "M" => @ver[:major],
-              "m" => @ver[:minor],
-              "p" => @ver[:patch],
-              "P" => @ver[:patch] ? ".#{@ver[:patch]}" : "",
-              "b" => @config._build_number,
-              "S" => @config._short_version,
-              "V" => @ver[:major] * 10 + @ver[:minor],
-              "v" => @ver[:major] * 100 + @ver[:minor] * 10 + (@ver[:patch] ? @ver[:patch] : 0),
-              "g" => @config._commit,
-            }
-            compre = Regexp.new("[" + comp.keys.join("") + "]")
-            
-            style = case @config.bundle_version_style
-            when :short_version
-              "S"
-            when :buildnum
-              "b"
-            when :githash
-              "g"
-            else
-              @config.bundle_version_style
-            end
-            
-            @config._bundle_version = style.gsub(compre) do |s|
-              comp[s]
-            end
-            
-            puts "Bundle Version: #{@config._bundle_version}"
-          end
-          
-          desc "Generate new build number, depending on selected scheme"
-          task :buildnum do
-            _prepare
-            buildnum = case @config.build_style
-            when :months
-              # Open repository and find out
-              prj_begin = Time.now
-              if (@config.first_revision)
-                prj_begin = @git.commit(@config.first_revision).authored_date
-              elsif (@config.first_date)
-                prj_begin = @config.first_date
-              else
-                prj_begin = @git.log.last.authored_date
-              end
-              
-              months = ((Time.now.month + 12 * Time.now.year) - (prj_begin.month + 12 * prj_begin.year))
-              "%d%02d" % [months, Time.now.day]
-            end
-            
-            @config._build_number = buildnum
-            puts "  Build number: #{buildnum}"
-          end
-          
-          desc "Writes exact version number"
-          task :write, :version do |t, args|
-            @plist = Plist::parse_xml(@config.plist)
-            @plist["CFBundleShortVersionString"] = args[:version]
-            @plist.save_plist(@config.plist)
-            puts "Short Version: #{args[:version]}"
-          end
-          
-          desc "Bumps version up"
-          task :bump do
-            _prepare
-            
-            # if we have patch, bump it up
-            if (@ver[:patch])
-              @ver[:patch] += 1
-            elsif (@ver[:minor])
-              @ver[:minor] += 1
-            else
-              @ver[:major] += 1
-            end
-            _write_back
-            puts "Bumped Version: " + "%d.%d%s" % [ @ver[:major], @ver[:minor], @ver[:patch] ? ".#{@ver[:patch]}" : "" ]
-          end
-          
-          namespace :bump do
-            desc "Bumps major version up"
-            task :major do
-              _prepare
-              @ver[:major] = @ver[:major] ? @ver[:major] + 1 : 1              
-              @ver[:minor] = 0
-              @ver[:patch] = nil
-              _write_back
-              puts "Bumped Version: " + "%d.%d%s" % [ @ver[:major], @ver[:minor], @ver[:patch] ? ".#{@ver[:patch]}" : "" ]
-            end
-            
-            desc "Bumps minor version up"
-            task :minor do
-              _prepare
-              @ver[:minor] = @ver[:minor] ? @ver[:minor] + 1 : 1              
-              @ver[:patch] = nil
-              _write_back
-              puts "Bumped Version: " + "%d.%d%s" % [ @ver[:major], @ver[:minor], @ver[:patch] ? ".#{@ver[:patch]}" : "" ]
-            end
-
-            desc "Bumps patch version up"
-            task :patch do
-              _prepare
-              @ver[:patch] = @ver[:patch] ? @ver[:patch] + 1 : 1              
-              _write_back
-              puts "Bumped Version: " + "%d.%d%s" % [ @ver[:major], @ver[:minor], @ver[:patch] ? ".#{@ver[:patch]}" : "" ]
-            end
-        end
-          
-        end
-        
-        namespace :build do
-          
-          desc "Prepares build environment"
-          task :prepare => ["version:bundlever"] do
-            raise "This task must be run in XCode Environment" unless ENV['XCODE_VERSION_ACTUAL']
-            
-            # Save our environment variables
-            ["BUILT_PRODUCTS_DIR", "BUILD_DIR", "CONFIGURATION", "CONFIGURATION_BUILD_DIR",
-              "PROJECT_DIR", "INFOPLIST_FILE", "TARGET_NAME"].each { |v|
-              # @buildCache.set v.downcase, ENV[v] unless ENV[v].nil?
-              @buildCache.send("#{v.downcase}=", ENV[v]) unless ENV[v].nil?
-            }
-            
-            # Increase buildcounter
-            if (@buildCache.build_counter.nil?)
-              @buildCache.build_counter = 0
-            end
-            
-            @buildCache.build_counter += 1
-            @buildCache.save
-            
-            # Save version info
-            product_plist = File.join(ENV['BUILT_PRODUCTS_DIR'], ENV['INFOPLIST_PATH'])
-            `/usr/bin/plutil -convert xml1 \"#{product_plist}\"`
-            pl = Plist::parse_xml(product_plist)
-            if (pl)
-              pl["CFBundleVersion"] = @config._bundle_version
-              pl["IBBuildNum"] = @config._build_number
-              pl["IBBuildDate"] = Time.new.strftime("%a %e %b %Y %H:%M:%S %Z %z")
-              pl["IBBuildType"] = ENV['CONFIGURATION']
-              pl["GCGitCommitHash"] = @config._commit # for hoptoadapp
-              pl.save_plist(product_plist)
-            end
-            `/usr/bin/plutil -convert binary1 \"#{product_plist}\"`
-          end
-        end
-      end
-    end
-  end
-end