ios-box 0.0.1 → 0.0.2

data/Rakefile

@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.files.include %w(lib/**/*.rb)
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'pbxproject'
+  gem.add_runtime_dependency 'pbxproject', '>=0.1.4'
   gem.add_runtime_dependency 'plist'
   gem.add_runtime_dependency 'grit'
   

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/ios-box.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ios-box}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mikko Kokkonen"]
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<pbxproject>, [">= 0"])
+      s.add_runtime_dependency(%q<pbxproject>, [">= 0.1.4"])
       s.add_runtime_dependency(%q<plist>, [">= 0"])
       s.add_runtime_dependency(%q<grit>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["> 1.2.3"])
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<pbxproject>, [">= 0"])
+      s.add_dependency(%q<pbxproject>, [">= 0.1.4"])
       s.add_dependency(%q<plist>, [">= 0"])
       s.add_dependency(%q<grit>, [">= 0"])
       s.add_dependency(%q<rspec>, ["> 1.2.3"])
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<pbxproject>, [">= 0"])
+    s.add_dependency(%q<pbxproject>, [">= 0.1.4"])
     s.add_dependency(%q<plist>, [">= 0"])
     s.add_dependency(%q<grit>, [">= 0"])
     s.add_dependency(%q<rspec>, ["> 1.2.3"])

data/lib/ios_box.rb

@@ -18,11 +18,23 @@ module IosBox
       
       # Load build cache
       @buildCache = BuildCache.load(@config.buildCache) || BuildCache.new
+      @buildCache.init(@config)
+      
       @namespace = namespace
       define
     end
 
     class BuildCache
+      def init config
+        # Fill our config object
+        # But only if it hasn't been initialized yet and not in XCode env
+        if (config.project_dir.nil? && ENV['XCODE_VERSION_ACTUAL'].nil?)
+          config.project_dir = @project_dir
+          config.infoplist_file= @infoplist_file
+          config.plist = File.join(@project_dir, @infoplist_file)
+        end
+      end
+      
       def self.load file = ".buildCache"
         return unless File.file?(file)
         YAML.load_file(file)
@@ -36,7 +48,13 @@ module IosBox
     class Config < OpenStruct
       def initialize args
         super
-        self.plist = File.join(ENV['PROJECT_DIR'] || '', ENV['INFOPLIST_FILE'] || '')
+        # 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
     
@@ -71,13 +89,31 @@ module IosBox
         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
-            @git = Grit::Repo.new("#{ENV['PROJECT_DIR']}")
+            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)
@@ -91,7 +127,8 @@ module IosBox
           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
+            @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
   
@@ -211,10 +248,12 @@ module IosBox
           
           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.instance_variable_set("@#{v.downcase}", ENV[v])
+              @buildCache.instance_variable_set("@#{v.downcase}", ENV[v]) unless ENV[v].nil?
             }
             @buildCache.save
             

metadata

@@ -2,7 +2,7 @@
 name: ios-box
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Mikko Kokkonen
@@ -86,7 +86,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: *id007
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4585312451122071517
+      hash: 682603116973402455
       segments: 
       - 0
       version: "0"