ios-box 0.2.1 → 0.2.3

data/lib/ios-box/deploy/testflight.rb

@@ -0,0 +1,35 @@
+require 'rest_client'
+
+module IOSBox
+  module Deploy
+    class Testflight < Deployer
+      def deploy(opts)
+        puts opts.to_yaml
+
+        response = RestClient.post 'http://testflightapp.com/api/builds.plist',
+          :api_token          => opts[:apitoken],
+          :team_token         => opts[:teamtoken],
+          :file               => File.new(opts[:file], 'rb'),
+          :notes              => opts[:notes],
+          :dsym               => (File.exists?(opts[:dsym]) ? File.new(opts[:dsym], 'rb') : nil),
+          :distribution_lists => opts[:distribution],
+          :notify             => opts[:notify],
+          :replace            => opts[:replace]
+
+        if response.code == 200
+          pl = Plist::parse_xml(response.to_str)
+
+          puts "Build Deployed."
+          puts "See it at: #{pl['config_url']}"
+
+          notify(
+            :name  => "Build Deployed",
+            :title => "Build Deployed",
+          :text  => "Build Deployed to Testflight.\nSee build at #{pl['config_url']}")
+        end
+
+        puts "Complete build at #{pl['config_url']}"
+      end
+    end
+  end
+end

data/lib/ios-box/iosbox.rb

@@ -4,16 +4,59 @@ require 'yaml'
 require 'grit'
 require 'plist'
 
-module Ios::Box
+module IOSBox
   class IOSBox
     attr_reader :config, :cache, :version
 
     def initialize
-      @config = Config.load
+      # @config = Config.load
+      @config = Config.load ".iosbox"
+
       @cache = Cache.load
       @version = Version.new(self)
     end
 
+    def project_dir(default = nil)
+      if ENV['XCODE_VERSION_ACTUAL']
+        pdir = ENV['PROJECT_DIR']
+      else
+        # Do we have buildcache?
+        if cache[:latest]
+          configuration = cache[:latest]
+          pdir = cache[configuration][:project_dir]
+        else
+          if default.nil?
+            raise "Build cache has not been filled, please build project."
+          else
+            pdir = default
+          end
+        end
+      end
+
+      pdir
+    end
+
+    def plist
+      if ENV['XCODE_VERSION_ACTUAL']
+        file = File.join(ENV['PROJECT_DIR'], ENV['INFOPLIST_FILE'])
+      else
+        # Do we have buildcache?
+        if cache[:latest]
+          configuration = cache[:latest]
+          file = File.join(cache[configuration][:project_dir], cache[configuration][:infoplist_file])
+        else
+          raise "Build cache has not been filled, please build project."
+        end
+      end
+
+      file
+    end
+
+    def git
+      @git ||= Grit::Repo.new(project_dir)
+    end
+
+
     class Version
       attr_reader :iosbox
 
@@ -24,52 +67,27 @@ module Ios::Box
       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)
+        # git = Grit::Repo.new(iosbox.project_dir)
+        pl = Plist::parse_xml(iosbox.plist)
 
         # Build normal version hash
-        @version = {
-          :short  => plist["CFBundleShortVersionString"],
-          :bundle => plist["CFBundleVersion"],
-          :commit => git.commit("HEAD").id_abbrev,
+        @version  = {
+          :short  => pl["CFBundleShortVersionString"],
+          :bundle => pl["CFBundleVersion"],
+          :commit => iosbox.git.commit("HEAD").id_abbrev,
+          :build  => pl["IBBuildNumber"],
         }
 
         # Build technical version number
-        if (m = plist["CFBundleShortVersionString"].match(/(\d+)\.(\d+)(\.(\d+))?/))
+        if (m = pl["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
+          @version[:technical] = @version[:major] + @version[:minor] / 100.0 + (@version[:patch] || 0) / 10000.0
         end
 
-        # Fetch current build number (project version)
-        # Check if we have build number in cache
-
-        @version[:build_number] = fetch_build_number
-
         @version
       end
 
@@ -82,34 +100,87 @@ module Ios::Box
         @version ||= load
         @version[v] = s
       end
-      
+
+      def to_a
+        (@version ||= load).to_a
+      end
+
       def marketing_version
+        load unless @version
         "%d.%d%s" % [ @version[:major], @version[:minor], @version[:patch] ? ".#{@version[:patch]}" : "" ]
       end
-      
+
+      def bundle_version
+        load unless @version
+
+        # Build our components
+        comp = {
+          "M" => @version[:major],
+          "m" => @version[:minor],
+          "p" => @version[:patch],
+          "P" => @version[:patch] ? ".#{@version[:patch]}" : "",
+          "b" => @version[:build],
+          "S" => marketing_version,
+          "V" => @version[:major] * 10 + @version[:minor],
+          "v" => @version[:major] * 100 + @version[:minor] * 10 + (@version[:patch] ? @version[:patch] : 0),
+          "x" => begin
+          prj_begin = Time.now
+          if (iosbox.config.first_revision)
+            prj_begin = iosbox.git.commit(iosbox.config.first_revision).authored_date
+          elsif (iosbox.config.first_date)
+            prj_begin = iosbox.config.first_date
+          else
+            prj_begin = iosbox.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,
+        }
+        compre = Regexp.new("[" + comp.keys.join("") + "]")
+
+        @version[:bundle] = (iosbox.config.bundle_version_style || "x").gsub(compre) do |s|
+          comp[s]
+        end
+      end
+
       def bump_build(buildnum = nil)
         # Fetch current build number (project version)
-        # Check if we have build number in cache
+        pl = Plist::parse_xml(iosbox.plist)
+        # pl["CFBundleShortVersionString"] = verstr
+        # pl.save_plist(plist)
+
         if buildnum.nil?
-          build = (fetch_build_number || 0) + 1
+          build = (pl["IBBuildNumber"] || 0) + 1
         else
           build = buildnum
         end
 
-        store_build_number(build)
-        
-        puts "Build number increased to #{iosbox.cache[:build_number]}"
+        pl["IBBuildNumber"] = build
+        pl["CFBundleVersion"] = bundle_version
+        pl.save_plist(iosbox.plist)
+
+        # Commit plist
+        if iosbox.config['autocommit']
+          iosbox.git.add iosbox.plist
+          iosbox.git.commit "Bumped build number"
+        end
+
+
+        puts "Build number increased to #{build}"
       end
 
       def set_marketing(verstr)
-        pl = Plist::parse_xml(plist)
+        pl = Plist::parse_xml(iosbox.plist)
         pl["CFBundleShortVersionString"] = verstr
-        pl.save_plist(plist)
+        pl.save_plist(iosbox.plist)
+
+        puts "New marketing version #{marketing_version}"
       end
-      
+
       def bump_marketing(type = :patch)
         load
-        
+
         if type == :major
           @version[:patch] = nil
           @version[:minor] = 0
@@ -120,84 +191,13 @@ module Ios::Box
         elsif type == :patch
           @version[:patch] = (@version[:patch] || 0) + 1
         end
-        
-        pl = Plist::parse_xml(plist)
+
+        pl = Plist::parse_xml(iosbox.plist)
         pl["CFBundleShortVersionString"] = marketing_version
-        pl.save_plist(plist)
-        
+        pl.save_plist(iosbox.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
 

data/lib/ios-box/tools.rb

@@ -1,11 +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
+module IOSBox
+  module Tools
+    autoload :Version, 'ios-box/tools/version'
+    autoload :Build, 'ios-box/tools/build'
+    autoload :Config, 'ios-box/tools/config'
+    autoload :Deploy, 'ios-box/tools/deploy'
   end
 end

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

@@ -1,62 +1,61 @@
-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}\"`
+module IOSBox
+  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
+
+        puts "Bundle Version: #{version[:bundle]}"
+        puts " Short Version: #{version[:short]}"
+        puts "         Build: #{version[:build]}"
+
+        # 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]
+          pl["IBBuildDate"] = Time.new.strftime("%a %e %b %Y %H:%M:%S %Z %z")
+          pl["IBBuildType"] = ENV['CONFIGURATION']
+          pl["GCGitCommitHash"] = version[:commit] # for airbrake
+          pl.save_plist(product_plist)
         end
-        
-        private
-        
+        # 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|
+            "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