ios-box 0.1.0 → 0.2.0

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -1,18 +1,4 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source 'http://rubygems.org'
 
-gem "plist"
-gem "pbxproject"
-gem "plist"
-gem "grit"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
+# Specify your gem's dependencies in ios-box.gemspec
+gemspec

data/Gemfile.lock

@@ -1,37 +1,24 @@
+PATH
+  remote: .
+  specs:
+    ios-box (0.0.1)
+      grit
+      plist
+      thor
+
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    git (1.2.5)
+    diff-lcs (1.1.3)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
     mime-types (1.16)
-    pbxproject (0.1.0)
     plist (3.1.0)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  grit
-  jeweler (~> 1.5.2)
-  pbxproject
-  plist
-  rcov
-  rspec (~> 2.3.0)
+  ios-box!

data/Rakefile

@@ -1,58 +1,2 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "ios-box"
-  gem.homepage = "http://github.com/owl-foresty/ios-box"
-  gem.license = "MIT"
-  gem.summary = %Q{Automates some common tasks in iOS development}
-  gem.description = %Q{ios-box offers automation and easy tasks for some most common tasks in iOS development.}
-  gem.email = "mikko.kokkonen@me.com"
-  gem.authors = ["Mikko Kokkonen"]
-  
-  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', '>=0.1.4'
-  gem.add_runtime_dependency 'plist'
-  gem.add_runtime_dependency 'grit'
-  
-  gem.add_development_dependency 'rspec', '> 1.2.3'
-  gem.add_development_dependency 'pbxproject', '>=0.1.4'
-  gem.add_development_dependency 'grit'
-  gem.add_development_dependency 'plist'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ios-box #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/bin/ios-box

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+# $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'ios-box/cli'
+
+Ios::Box::CLI.start

data/ios-box.gemspec

@@ -1,103 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/ios-box/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{ios-box}
-  s.version = "0.1.0"
+Gem::Specification.new do |gem|
+  gem.authors       = ["Mikko Kokkonen"]
+  gem.email         = ["mikko@owlforestry.com"]
+  gem.description   = %q{Include atuomatic vesion conrol for you XCode projects.}
+  gem.summary       = %q{Add handy tools to XCode specially for iOS development}
+  gem.homepage      = "https://github.com/owl-forestry/ios-box"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mikko Kokkonen"]
-  s.date = %q{2011-05-14}
-  s.description = %q{ios-box offers automation and easy tasks for some most common tasks in iOS development.}
-  s.email = %q{mikko.kokkonen@me.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "dump",
-    "ios-box.gemspec",
-    "lib/build_cache.rb",
-    "lib/ios-box.rb",
-    "lib/ios_box.rb",
-    "patch",
-    "spec/build_cache_spec.rb",
-    "spec/ios-box_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/owl-foresty/ios-box}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Automates some common tasks in iOS development}
-  s.test_files = [
-    "spec/build_cache_spec.rb",
-    "spec/ios-box_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<plist>, [">= 0"])
-      s.add_runtime_dependency(%q<pbxproject>, [">= 0"])
-      s.add_runtime_dependency(%q<plist>, [">= 0"])
-      s.add_runtime_dependency(%q<grit>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      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.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"])
-      s.add_development_dependency(%q<pbxproject>, [">= 0.1.4"])
-      s.add_development_dependency(%q<grit>, [">= 0"])
-      s.add_development_dependency(%q<plist>, [">= 0"])
-    else
-      s.add_dependency(%q<plist>, [">= 0"])
-      s.add_dependency(%q<pbxproject>, [">= 0"])
-      s.add_dependency(%q<plist>, [">= 0"])
-      s.add_dependency(%q<grit>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      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.1.4"])
-      s.add_dependency(%q<plist>, [">= 0"])
-      s.add_dependency(%q<grit>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["> 1.2.3"])
-      s.add_dependency(%q<pbxproject>, [">= 0.1.4"])
-      s.add_dependency(%q<grit>, [">= 0"])
-      s.add_dependency(%q<plist>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<plist>, [">= 0"])
-    s.add_dependency(%q<pbxproject>, [">= 0"])
-    s.add_dependency(%q<plist>, [">= 0"])
-    s.add_dependency(%q<grit>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    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.1.4"])
-    s.add_dependency(%q<plist>, [">= 0"])
-    s.add_dependency(%q<grit>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["> 1.2.3"])
-    s.add_dependency(%q<pbxproject>, [">= 0.1.4"])
-    s.add_dependency(%q<grit>, [">= 0"])
-    s.add_dependency(%q<plist>, [">= 0"])
-  end
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = "ios-box"
+  gem.require_paths = ["lib"]
+  gem.version       = Ios::Box::VERSION
+  
+  gem.add_runtime_dependency  "thor"
+  gem.add_runtime_dependency  "grit"
+  gem.add_runtime_dependency  "plist"
 end
-

data/lib/ios-box.rb

@@ -1 +1,7 @@
-require 'ios_box'
+require "ios-box/version"
+
+module Ios
+  module Box
+    # Your code goes here...
+  end
+end

data/lib/ios-box/cli.rb

@@ -0,0 +1,96 @@
+require 'ios-box/tools'
+require 'ios-box/iosbox'
+require 'thor'
+require 'pbxproject'
+
+module Ios
+  module Box
+    class CLI < Thor
+      include Thor::Actions
+      
+      desc "version COMMAND", "Version related subcommands"
+      subcommand "version", Tools::Version
+      
+      desc "build COMMAND", "Build related subcommands"
+      subcommand "build", Tools::Build
+      
+      desc "integrate [PROJECT]", "Integrates ios-box with project, by default first founded"
+      def integrate(project = nil)
+        shell = Thor::Shell::Basic.new
+        
+        # Find our project
+        if project.nil?
+          project = Dir["*.xcodeproj"].first
+        end
+        
+        unless File.exists?(project) and File.directory?(project)
+          shell.error "Project #{project} is not valid."
+          exit
+        end
+        
+        shell.say "Integrating to project #{project}"
+        
+        # Find our project file, either from command-line or just using first one
+        xcode = project || Dir["*.xcodeproj"].first
+        raise "Cannot find project.pbxproj in #{xcode}" unless File.file? "#{xcode}/project.pbxproj"
+        
+        # Load our project file
+        pbx = PBXProject::PBXProject.new :file => "#{xcode}/project.pbxproj"
+        pbx.parse
+        
+        # If target missing, fetch first target
+        # Find all targets
+        targets = pbx.find_item :type => PBXProject::PBXTypes::PBXNativeTarget
+        if targets.nil? or targets.empty?
+          raise "XCode project does not have any targets!"
+        end
+        
+        # Generate build phase
+        # Try to find build phases
+        # prebuilds = pbx.find_item(:type => PBXProject::PBXTypes::PBXShellScriptBuildPhase) || []
+        # prebuilds.select! do |c|
+        #   !c.comment.match(/ios-box prepare/).nil?
+        # end
+        # 
+        prebuilds = [] # Always add new build phase
+        if prebuilds.empty?        
+          initPhase = PBXProject::PBXTypes::PBXShellScriptBuildPhase.new(
+            :shellPath => '/bin/sh',
+            :shellScript => "\"(cd $PROJECT_DIR; ruby ~/Code/ios-box/bin/ios-box build prepare)\"",
+            :showEnvVarsInLog => 0,
+            :name => '"ios-box prepare"'
+            )
+          initPhase.comment = "ios-box prepare"
+
+          pbx.add_item initPhase
+        else
+          initPhase = prebuilds.first
+        end
+        
+        _targets = ""
+        targets.each do |target|
+          if shell.yes?("Integrate with target #{target.name.value}? [yn]")
+            # Inject buildphase to target
+            # Add to target
+            target.add_build_phase initPhase, 0
+            _targets << "config.targets << \"#{target.name.value}\""
+          end
+        end
+        
+        # Create iosbox configuration file
+        create_file ".iosbox" do
+          "# ios-box configuration file\n" +
+          "# https://github.com/owl-forestry/ios-box\n" +
+          "#\n" +
+          "config.project = \"#{project}\"\n" +
+          "#{_targets}\n"
+        end
+        # Append buildcache to gitignore
+        send((File.exists?(".gitignore") ? :append_to_file : :create_file), ".gitignore", ".buildcache\n")
+        
+        # Write project file
+        pbx.write_to :file => "#{xcode}/project.pbxproj"
+      end
+    end
+  end
+end

data/lib/ios-box/config.rb

@@ -0,0 +1,23 @@
+module Ios
+  module Box
+    class Config
+      attr_accessor :project
+      attr_reader :targets
+
+      def self.load(file = ".iosbox")
+        config = self.new
+        config.instance_eval(File.read(file), file)
+        config
+      end
+      
+      def initialize
+        @targets = []
+        @project = nil
+      end
+      
+      def config
+        self
+      end
+    end
+  end
+end

data/lib/ios-box/iosbox.rb

@@ -0,0 +1,235 @@
+require 'ios-box/config'
+require 'rubygems'
+require 'yaml'
+require 'grit'
+require 'plist'
+
+module Ios::Box
+  class IOSBox
+    attr_reader :config, :cache, :version
+
+    def initialize
+      @config = Config.load
+      @cache = Cache.load
+      @version = Version.new(self)
+    end
+
+    class Version
+      attr_reader :iosbox
+
+      def initialize(iosbox)
+        @iosbox = iosbox
+      end
+
+      def load
+        # Return cached version
+        return @version if @version
+        
+        # iOS code
+        # XCode environment?
+        # Load buildcache if exists
+        if ENV['XCODE_VERSION_ACTUAL']
+          plist_file = File.join(ENV['PROJECT_DIR'], ENV['INFOPLIST_FILE'])
+          project_dir = ENV['PROJECT_DIR']
+        else
+          # Do we have buildcache?
+          if iosbox.cache[:latest]
+            configuration = iosbox.cache[:latest]
+            plist_file = File.join(iosbox.cache[configuration][:project_dir], iosbox.cache[configuration][:infoplist_file])
+            project_dir = iosbox.cache[configuration][:project_dir]
+          else
+            raise "Build cache has not been filled, please build project."
+          end
+        end
+
+        # Detect our commit hash
+        git = Grit::Repo.new("#{project_dir}")
+
+        plist = Plist::parse_xml(plist_file)
+
+        # Build normal version hash
+        @version = {
+          :short  => plist["CFBundleShortVersionString"],
+          :bundle => plist["CFBundleVersion"],
+          :commit => git.commit("HEAD").id_abbrev,
+        }
+
+        # Build technical version number
+        if (m = plist["CFBundleShortVersionString"].match(/(\d+)\.(\d+)(\.(\d+))?/))
+          @version[:major] = Integer(m[1]) if m[1]
+          @version[:minor] = Integer(m[2]) if m[2]
+          @version[:patch] = Integer(m[4]) if m[4]
+          @version[:technical] = @version[:major] + ((@version[:minor] * 100) / 1000.0)
+          if @version[:patch]
+            @version[:technical] += ((@version[:patch] > 10) ? @version[:patch] : @version[:patch] * 10) / 1000.0
+          end
+        end
+
+        # Fetch current build number (project version)
+        # Check if we have build number in cache
+
+        @version[:build_number] = fetch_build_number
+
+        @version
+      end
+
+      def [](v)
+        @version ||= load
+        @version[v]
+      end
+
+      def []=(v, s)
+        @version ||= load
+        @version[v] = s
+      end
+      
+      def marketing_version
+        "%d.%d%s" % [ @version[:major], @version[:minor], @version[:patch] ? ".#{@version[:patch]}" : "" ]
+      end
+      
+      def bump_build(buildnum = nil)
+        # Fetch current build number (project version)
+        # Check if we have build number in cache
+        if buildnum.nil?
+          build = (fetch_build_number || 0) + 1
+        else
+          build = buildnum
+        end
+
+        store_build_number(build)
+        
+        puts "Build number increased to #{iosbox.cache[:build_number]}"
+      end
+
+      def set_marketing(verstr)
+        pl = Plist::parse_xml(plist)
+        pl["CFBundleShortVersionString"] = verstr
+        pl.save_plist(plist)
+      end
+      
+      def bump_marketing(type = :patch)
+        load
+        
+        if type == :major
+          @version[:patch] = nil
+          @version[:minor] = 0
+          @version[:major] += 1
+        elsif type == :minor
+          @version[:patch] = nil
+          @version[:minor] += 1
+        elsif type == :patch
+          @version[:patch] = (@version[:patch] || 0) + 1
+        end
+        
+        pl = Plist::parse_xml(plist)
+        pl["CFBundleShortVersionString"] = marketing_version
+        pl.save_plist(plist)
+        
+        puts "New marketing version #{marketing_version}"
+      end
+
+      private
+        def fetch_build_number
+          unless iosbox.cache[:build_number]
+            puts "Project: #{iosbox.config.project}"
+            pbx = PBXProject::PBXProject.new :file => File.join(iosbox.config.project, "project.pbxproj")
+            pbx.parse
+            
+            iosbox.config.targets.each do |target|
+              target = pbx.find_item :name => target, :type => PBXProject::PBXTypes::PBXNativeTarget
+              cl = pbx.find_item :guid => target.buildConfigurationList.value, :type => PBXProject::PBXTypes::XCConfigurationList
+              cl.buildConfigurations.each do |bc|
+                bc = pbx.find_item :guid => bc.value, :type => PBXProject::PBXTypes::XCBuildConfiguration
+
+                if bc.buildSettings["CURRENT_PROJECT_VERSION"]
+                  iosbox.cache[:build_number] = bc.buildSettings["CURRENT_PROJECT_VERSION"].value
+                  break
+                end
+              end
+
+              break if iosbox.cache[:build_number]
+            end
+
+            # Save build number to cache
+            iosbox.cache.save
+          end
+
+          Integer(iosbox.cache[:build_number] || 0)
+        end
+
+        def store_build_number(build)
+          puts "Project: #{iosbox.config.project}"
+          pbx = PBXProject::PBXProject.new :file => File.join(iosbox.config.project, "project.pbxproj")
+          pbx.parse
+
+          iosbox.config.targets.each do |target|
+            target = pbx.find_item :name => target, :type => PBXProject::PBXTypes::PBXNativeTarget
+            cl = pbx.find_item :guid => target.buildConfigurationList.value, :type => PBXProject::PBXTypes::XCConfigurationList
+            cl.buildConfigurations.each do |bc|
+              bc = pbx.find_item :guid => bc.value, :type => PBXProject::PBXTypes::XCBuildConfiguration
+
+              if bc.buildSettings["CURRENT_PROJECT_VERSION"]
+                bc.buildSettings["CURRENT_PROJECT_VERSION"].value = "\"#{build}\""
+              else
+                bc.buildSettings["CURRENT_PROJECT_VERSION"] = PBXProject::PBXTypes::BasicValue.new :value => "\"#{build}\""
+              end
+            end
+          end
+          
+          # Save build number to pbxproject and to cache
+          pbx.write_to :file => File.join(iosbox.config.project, "project.pbxproj")
+          iosbox.cache[:build_number] = build
+          iosbox.cache.save
+        end
+        
+        # Return plist file name
+        def plist
+          if ENV['XCODE_VERSION_ACTUAL']
+            file = File.join(ENV['PROJECT_DIR'], ENV['INFOPLIST_FILE'])
+          else
+            # Do we have buildcache?
+            if iosbox.cache[:latest]
+              configuration = iosbox.cache[:latest]
+              file = File.join(iosbox.cache[configuration][:project_dir], iosbox.cache[configuration][:infoplist_file])
+            else
+              raise "Build cache has not been filled, please build project."
+            end
+          end
+          
+          file
+        end
+    end
+  end
+
+
+
+  class Cache
+    attr_accessor :cache
+
+    def self.load(file = ".buildcache")
+      cache = Cache.new
+
+      if File.exists?(file)
+        cache.cache = YAML.load(File.read(file))
+      end
+
+      cache
+    end
+
+    def initialize
+      @cache = {}
+    end
+
+    def [](v)
+      @cache[v]
+    end
+
+    def []=(v, s)
+      @cache[v] = s
+    end
+
+    def save(file = ".buildcache")
+      File.open(file, 'w') { |io| io.puts @cache.to_yaml }
+    end
+  end
+end

data/lib/ios-box/tasks.rb

@@ -0,0 +1,23 @@
+require 'ios-box/config'
+require 'ios-box/iosbox'
+
+require 'rake/tasklib'
+require 'rubygems'
+require 'yaml'
+require 'grit'
+require 'plist'
+require 'pbxproject'
+
+module Ios
+  module Box
+    class Tasks < ::Rake::TaskLib
+      def initialize(namespace = :iosbox, &block)
+      end
+      
+    private
+      def require_xcode
+        raise "This task must be run in XCode Environment" unless ENV['XCODE_VERSION_ACTUAL']
+      end
+    end
+  end
+end

data/lib/ios-box/tools.rb

@@ -0,0 +1,11 @@
+require 'ios-box/iosbox'
+require 'thor'
+
+module Ios
+  module Box
+    module Tools
+      autoload :Version, 'ios-box/tools/version'
+      autoload :Build, 'ios-box/tools/build'
+    end
+  end
+end

data/lib/ios-box/tools/build.rb

@@ -0,0 +1,62 @@
+module Ios
+  module Box
+    module Tools
+      class Build < Thor
+        
+        desc "prepare", "Prepare build environment from XCode"
+        def prepare
+          # Make sure we are in XCode environment
+          require_xcode
+          
+          # Update build cache
+          update_cache
+          
+          version = IOSBox.new.version
+          
+          # Calculate build number (displayed)
+          puts "TODO: build number"
+          
+          # Inject information to Info.plist
+          product_plist = File.join(ENV['BUILT_PRODUCTS_DIR'], ENV['INFOPLIST_PATH'])
+          
+          # Convert PList to XML
+          `/usr/bin/plutil -convert xml1 \"#{product_plist}\"`
+          pl = Plist::parse_xml(product_plist)
+          if (pl)
+            # pl["CFBundleVersion"] = @config._bundle_version
+            pl["IBBuildNum"] = version[:build_number]
+            pl["IBBuildDate"] = Time.new.strftime("%a %e %b %Y %H:%M:%S %Z %z")
+            pl["IBBuildType"] = ENV['CONFIGURATION']
+            pl["GCGitCommitHash"] = version[:commit] # for hoptoadapp
+            pl.save_plist(product_plist)
+          end
+          # Convert PList back to binary
+          `/usr/bin/plutil -convert binary1 \"#{product_plist}\"`
+        end
+        
+        private
+        
+        def update_cache
+          cache = IOSBox.new.cache
+          
+          # Save our environment variables
+          if ENV["CONFIGURATION"]
+            configuration = ENV["CONFIGURATION"].downcase.to_sym
+            cache[configuration] ||= {}
+            cache[:latest] = configuration
+            ["BUILT_PRODUCTS_DIR", "BUILD_DIR", "CONFIGURATION", "CONFIGURATION_BUILD_DIR",
+              "PROJECT_DIR", "INFOPLIST_FILE", "TARGET_NAME"].each do |v|
+              cache[configuration][v.downcase.to_sym] = ENV[v]
+            end
+          end
+          
+          cache.save
+        end
+        
+        def require_xcode
+          raise "This task must be run in XCode Environment" unless ENV['XCODE_VERSION_ACTUAL']
+        end
+      end
+    end
+  end
+end

data/lib/ios-box/tools/version.rb

@@ -0,0 +1,33 @@
+module Ios
+  module Box
+    module Tools
+      class Version < Thor
+        desc "show", "Displays current version information"
+        def show
+          version = IOSBox.new.version
+          
+          puts "  Short Version: #{version[:short]}"
+          puts " Bundle Version: #{version[:bundle]}"
+          puts "      Technical: %1.3f" % version[:technical]
+          puts "   Build Number: #{version[:build_number]}"
+          puts "         Commit: #{version[:commit]}"
+        end
+        
+        desc "build [BUILDNUM]", "Increments current build number or sets it to defined."
+        def build(buildnum = nil)
+          IOSBox.new.version.bump_build(buildnum)
+        end
+        
+        desc "set VERSION", "Sets new marketing version"
+        def set(ver)
+          IOSBox.new.version.set_marketing(ver)
+        end
+        
+        desc "bump [major|minor]", "Bumps marketings version by one"
+        def bump(type = :patch)
+          IOSBox.new.version.bump_marketing(type.downcase.to_sym)
+        end
+      end
+    end
+  end
+end

data/lib/ios-box/version.rb

@@ -0,0 +1,5 @@
+module Ios
+  module Box
+    VERSION = "0.2.0"
+  end
+end

metadata

@@ -1,194 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ios-box
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-14 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: plist
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-10-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70265489724360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pbxproject
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: plist
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70265489724360
+- !ruby/object:Gem::Dependency
   name: grit
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70265489723740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: pbxproject
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70265489723740
+- !ruby/object:Gem::Dependency
   name: plist
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: grit
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &70265489723040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
-  type: :development
-  prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: pbxproject
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.4
-  type: :development
-  prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: grit
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: plist
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id015
-description: ios-box offers automation and easy tasks for some most common tasks in iOS development.
-email: mikko.kokkonen@me.com
-executables: []
-
+  version_requirements: *70265489723040
+description: Include atuomatic vesion conrol for you XCode projects.
+email:
+- mikko@owlforestry.com
+executables:
+- ios-box
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.md
-files: 
+extra_rdoc_files: []
+files:
 - .document
+- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -196,47 +61,46 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- dump
+- bin/ios-box
 - ios-box.gemspec
-- lib/build_cache.rb
 - lib/ios-box.rb
+- lib/ios-box/cli.rb
+- lib/ios-box/config.rb
+- lib/ios-box/iosbox.rb
+- lib/ios-box/tasks.rb
+- lib/ios-box/tools.rb
+- lib/ios-box/tools/build.rb
+- lib/ios-box/tools/version.rb
+- lib/ios-box/version.rb
 - lib/ios_box.rb
-- patch
 - spec/build_cache_spec.rb
 - spec/ios-box_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/owl-foresty/ios-box
-licenses: 
-- MIT
+homepage: https://github.com/owl-forestry/ios-box
+licenses: []
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1478862092490478258
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Automates some common tasks in iOS development
-test_files: 
+summary: Add handy tools to XCode specially for iOS development
+test_files:
 - spec/build_cache_spec.rb
 - spec/ios-box_spec.rb
 - spec/spec_helper.rb

data/lib/build_cache.rb

@@ -1,44 +0,0 @@
-module IosBox
-  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) unless @project_dir.nil?
-      end
-    end
-  
-    def self.load file = ".buildCache"
-      return unless File.file?(file)
-      YAML.load_file(file)
-    end
-  
-    def save file = ".buildCache"
-      File.open(file, 'w') { |io| YAML.dump(self, io) }
-    end
-  
-    def method_missing(m, *args, &block)
-      if (args.length > 0)
-        self.class.class_eval do
-          define_method("#{m.to_s[0, m.to_s.length - 1]}") do
-            instance_variable_get("@#{m.to_s[0, m.to_s.length - 1]}")
-          end
-
-          define_method("#{m.to_s[0, m.to_s.length - 1]}=") do |val|
-            instance_variable_set("@#{m.to_s[0, m.to_s.length - 1]}", val)
-          end
-        end
-        return instance_variable_set("@#{m.to_s[0, m.to_s.length - 1]}", args[0])
-      end
-
-      self.class.class_eval do
-        define_method(m) do
-          instance_variable_get("@#{m}")
-        end
-      end
-      return instance_variable_get("@#{m}")
-    end
-  end
-end

data/patch

@@ -1 +0,0 @@
-(in /Users/mikko/Documents/ios-box)