ios_android_toolbox 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 516fadb8d12fefef4ab86cb254db207ac36f1c3e
-  data.tar.gz: a9d581c026006355b3a74598521d6aef75e58ce2
+  metadata.gz: 387576a63198d50d341779c11bee0e42d586a3e3
+  data.tar.gz: ef990d697317c14c36602c4929b1025206f41683
 SHA512:
-  metadata.gz: bc05b0f5fab4ec01f6f220cb60d02f22dad91a4b2635d6daca566101e1f8b08b9705b88cc7f2acc62314cfb63ae937856d59de5363cee50fc56b0eaefce67e57
-  data.tar.gz: 0e5a498ad5c170cb6457e4edcf1e32e51e51e94c3fb39c4c3302e371dfcb68421a46ae515f4a27b5914521351b3e0c6060716be8b4f7d65d2fbe52257ea5b271
+  metadata.gz: 75dc0fbda087b5920e7e852e602edf30dff6fd297c11beec6b0a8fbd47697ceb703d9ec4dc0a50960d0b55411bdd5b22f89375f973c686007b2a456eee3f39f3
+  data.tar.gz: b4464bf999d73a06844ecfac28ffe2a2b88347e11ad2aa59b1bdafd7caaa529d2adc30db57f2ec89b2068c2f284c01b8e73da50d3d8daf94aa0ff53742d973e8

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rspec
+vendor

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in ios_toolbox.gemspec
 #gemspec
@@ -6,3 +6,5 @@ source "http://rubygems.org"
 gem 'git'
 gem 'plist', :git => 'git://github.com/igorsales/plist.git', :require => 'plist'
 gem 'nokogiri'
+gem 'rspec',              :group => :development
+gem 'rspec-expectations', :group => :development

data/ios_android_toolbox.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency 'git'
   #s.add_runtime_dependency 'plist', :git => 'git://github.com/igorsales/plist.git', :require => 'plist'

data/lib/ios_android_toolbox/base.rb

@@ -63,7 +63,7 @@ module IosAndroidToolbox
         v = $1
         suffix = $2
       end
-      v.split('.')
+      v.split(/[\.]/)
     end
 
     def suffix
@@ -112,6 +112,10 @@ module IosAndroidToolbox
       raise "Abstract method. Please override"
     end
 
+    def next_build_number!
+      raise "Abstract method. Please override"
+    end
+
     def write_to_output_file(output_file)
         raise "Abstract method. Please override"
     end

data/lib/ios_android_toolbox/ios.rb

@@ -8,8 +8,8 @@ require 'ios_android_toolbox/base'
 module IosAndroidToolbox
 
   class IosVersionController < VersionController
-    VERSION_KEY = 'CFBundleVersion'
-    SHORT_VERSION_KEY = 'CFBundleShortVersionString'
+    BUILD_VERSION_KEY = 'CFBundleVersion' # User as Build  or release candidate
+    BUNDLE_VERSION_KEY = 'CFBundleShortVersionString' # Use as Version
     URL_TYPES_KEY = "CFBundleURLTypes"
     URL_SCHEMES_KEY = "CFBundleURLSchemes"
     BUNDLE_IDENTIFIER_KEY = "CFBundleIdentifier"
@@ -26,7 +26,7 @@ module IosAndroidToolbox
         if File.exists?(filename)
           begin
             dict = Plist.parse_xml(filename)
-            candidates.push filename if dict and dict[SHORT_VERSION_KEY]
+            candidates.push filename if dict and dict[BUNDLE_VERSION_KEY]
           rescue
             # Do nothing, just skip the file. Must be in binary format
           end
@@ -46,13 +46,13 @@ module IosAndroidToolbox
         raise "Cannot parse file #{version_file}"
       end
 
-      raise "File #{version_file} does not have a #{SHORT_VERSION_KEY} key" if @dict[SHORT_VERSION_KEY].nil?
+      raise "File #{version_file} does not have a #{BUNDLE_VERSION_KEY} key" if @dict[BUNDLE_VERSION_KEY].nil?
         
       self
     end
 
     def version
-      @dict[SHORT_VERSION_KEY]
+      "#{@dict[BUNDLE_VERSION_KEY]}-#{@dict[BUILD_VERSION_KEY]}"
     end
 
     def bundle_id
@@ -75,8 +75,42 @@ module IosAndroidToolbox
       bundle_id
     end
 
-    def next_version!(inc_idx = nil)
-      @dict[SHORT_VERSION_KEY] = @dict[VERSION_KEY] = next_version
+    def bundle_version
+      @dict[BUNDLE_VERSION_KEY]
+    end
+
+    def build_number
+      @dict[BUILD_VERSION_KEY]
+    end
+
+    def next_version(inc_idx = @inc_idx)
+      if inc_idx == @inc_idx # trying to increment build number
+        v = bundle_version
+        s = (build_number.to_i + 1).to_s
+      else
+        v = super.next_version(inc_idx)
+        s = build_number
+      end
+
+      "#{v}-#{s}"
+    end
+
+    def next_version!(inc_idx = @inc_idx)
+      if inc_idx < @inc_idx
+        @dict[BUNDLE_VERSION_KEY] = next_version(inc_idx)
+      else
+        @dict[BUILD_VERSION_KEY] = (build_number.to_i + 1).to_s
+      end
+
+      version
+    end
+
+    def next_build_number
+      next_version(@inc_idx)
+    end
+
+    def next_build_number!
+      next_version!(@inc_idx)
     end
 
     def url_types

data/lib/ios_android_toolbox/version.rb

@@ -1,3 +1,3 @@
 module IosAndroidToolbox
-  VERSION = "0.0.41"
+  VERSION = "0.0.42"
 end

data/spec/fixtures/info1.plist

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>icon_app.png</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>icon_app.png</string>
+		<string>icon_app@2x.png</string>
+	</array>
+	<key>CFBundleIdentifier</key>
+	<string>com.example.app</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.2.3</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array/>
+	<key>CFBundleVersion</key>
+	<string>4</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string></string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
+	<key>NSMainNibFile</key>
+	<string>MainWindow</string>
+	<key>UIBackgroundModes</key>
+	<array/>
+</dict>
+</plist>

data/spec/ios_version_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+include IosAndroidToolbox
+
+describe 'iOS versioning', :type => :model do
+	before :all do
+
+	end
+
+	before :each do
+		@controller = IosVersionController.new(File.join(File.dirname(__FILE__),'fixtures','info1.plist'))
+	end
+
+	it 'should read the right version number' do
+		expect(@controller.version).to eq '1.2.3-4'
+	end
+
+	it 'increments the build number on next version' do
+		expect(@controller.next_build_number!).to eq '1.2.3-5'
+		expect(@controller.version).to eq '1.2.3-5'
+	end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'ios_android_toolbox'
+
+RSpec.configure do |config|
+	
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ios_android_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Igor Sales
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +96,9 @@ files:
 - lib/ios_android_toolbox/ios.rb
 - lib/ios_android_toolbox/ios_prov_profile.rb
 - lib/ios_android_toolbox/version.rb
+- spec/fixtures/info1.plist
+- spec/ios_version_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -105,4 +122,7 @@ rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Toolbox to manipulate iOS/Android projects
-test_files: []
+test_files:
+- spec/fixtures/info1.plist
+- spec/ios_version_spec.rb
+- spec/spec_helper.rb