timewizard 0.3.0.pre.alpha.pre.57 → 0.3.0.pre.alpha.pre.58

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDZlMzk4OTdkODc5OGI5YWYzOGZlYzk2NGE5MzZiYTAzMmI5Zjg2NQ==
+    MmEyNTI1ZjVlNDIyMDc2ZGVmMGY5MmIyNjQyZTE2YTQ1M2FlZDliMg==
   data.tar.gz: !binary |-
-    YjNlMDkxOWFjY2M0NjliYWUzMTdiMGE1YzY3MWQ5ZDNkYTZlMGI0OA==
+    ZjczYWM0NDc5Yzg1NWQ2YWNlZmUwZjU0MTBjYTA2YzE5OGZlZDhiOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmMyMzY4MDc2NzcwODIyN2ZkMWZkZjhjNzY3ZWI5NzAxYmUxMzM0YWFmZDM0
-    ZWYwMWZiYWJhNDBlM2NjNmExMmI4ZDRhNjliMTA5MzNhMTBhNDJhNjkyNjYw
-    MzQ0ZTRiYTI5YzIzNmIyZTBiZDc1Y2Y0ZTU1YTVmMzUxZDQyZjI=
+    MzNiNGRhMWE2NDBhMzU3NzlkY2YwMDk1Mzg5N2VhNjgxZWE5OTA4NGM4NWZi
+    YWVkYjBhYzBmNGQxZWZlN2ZmOWM0M2E5MjBkYzcxMTljMGJjZmU3MTdiNjc0
+    ZDc4ZDZhNTg2YTUyZDk5ZTE2Nzc4MGY5MzFlYjllN2NjZDg0ZmY=
   data.tar.gz: !binary |-
-    MjZkNGExMzMzYzhmOTM0Y2ZlMWZlNmE5Mjk0NmE3OGZlYWVlYTExMWQ1ZDdk
-    NzFiYjUwZGY5MTVhMjQzMGEyMGM0MDkxZTFiZTk3YzY5YzEwMzI4YzM5MjMy
-    YTc3NmU2YzlkZTQxMTllZTVkMWFlOWNhYWFiNTFlN2Q2MWQ2YmY=
+    YWFiMWI0MWFlY2ExM2VhMjNiOWM5NzhiOGYxYmRmOTk2ZjZlZjliZjVkYWE1
+    ODI5YjM1YWVmYmI4OTVjYjdlYzBjODhkZDkyNzQxNjk4NzdjM2E0NjI2OWQ4
+    OTg3Y2RlZjdjNGRhZGJhNWU1ZGVkZjg0Zjk4MThjNTdiYTVkMDI=

data/gemspec.yml

@@ -16,4 +16,4 @@ development_dependencies:
 
 dependencies:
   versionomy: ~> 0.4
-  xcodeproj: ~> 0.26
+  CFPropertyList: ~> 2.3

data/lib/timewizard/version.rb

@@ -1,5 +1,7 @@
 # It's time-y wime-y and wibbly wobbley. Abracadabra.
 # @author Richard Harrah
 module Timewizard
+  # Version of this gem.
+  # @return [String] current version
   VERSION = "0.3.0"
 end

data/lib/timewizard/versioner/android.rb

@@ -7,6 +7,16 @@ module Timewizard
     # @since 0.1.0
     class Android < Timewizard::Versioner::Base
 
+      #
+      # Public functions (inherited from parent)
+      #
+      public
+
+      def initialize(path_to_file)
+        super path_to_file
+        @file_contents = ''
+      end
+
       #
       # Private functions (implementation specific)
       #

data/lib/timewizard/versioner/apple.rb

@@ -1,4 +1,4 @@
-require 'xcodeproj'
+require 'cfpropertylist'
 require 'timewizard/versioner'
 
 module Timewizard
@@ -8,6 +8,16 @@ module Timewizard
     # @since 0.2.3
     class Apple < Timewizard::Versioner::Base
 
+      #
+      # Public functions (inherited from parent)
+      #
+      public
+
+      def initialize(path_to_file)
+        super path_to_file
+        @file_contents = CFPropertyList::List.new
+      end
+
       #
       # Private functions (implementation specific)
       #
@@ -18,10 +28,10 @@ module Timewizard
           raise 'file is nil and cannot be read'
         end
 
-        @file_contents = {}
+        @file_contents = CFPropertyList::List.new
 
         if File.exist?(@file)
-          @file_contents = Xcodeproj::PlistHelper.read @file
+          @file_contents.load(@file)
         end
 
         @file_contents
@@ -34,7 +44,7 @@ module Timewizard
         if @file_contents.nil?
           raise 'file_contents is nil and cannot be written'
         end
-        Xcodeproj::PlistHelper.write(@file_contents, @file)
+        @file_contents.save(@file)
       end
 
       def find_build_and_version_numbers
@@ -42,8 +52,10 @@ module Timewizard
           read_file
         end
 
-        build_num = Timewizard::Utils::Wizardry.only_version(@file_contents["CFBundleVersion"]) || '0'
-        version_num = Timewizard::Utils::Wizardry.only_version(@file_contents["CFBundleShortVersionString"]) || '0'
+        data = CFPropertyList.native_types(@file_contents.value)
+
+        build_num = Timewizard::Utils::Wizardry.only_version(data['CFBundleVersion'])
+        version_num = Timewizard::Utils::Wizardry.only_version(data['CFBundleShortVersionString'])
 
         parsed_build_num = Versionomy.parse(build_num, Versionomy::Format.get('rubygems'))
         parsed_version_num = Versionomy.parse(version_num, Versionomy::Format.get('rubygems'))
@@ -63,17 +75,23 @@ module Timewizard
         if @new_build_number.nil?
           read_build_numbers
         end
-        @file_contents["CFBundleVersion"] = @new_build_number.to_s || @file_contents["CFBundleVersion"]
+        data = CFPropertyList.native_types(@file_contents.value)
+        data['CFBundleVersion'] = @new_build_number.to_s
+
+        @file_contents.value = CFPropertyList.guess(data)
       end
 
       def change_version_numbers
         if @file_contents.nil?
           read_file
         end
-        if @new_build_number.nil?
+        if @new_version_number.nil?
           read_build_numbers
         end
-        @file_contents["CFBundleShortVersionString"] = @new_build_number.to_s || @file_contents["CFBundleShortVersionString"]
+        data = CFPropertyList.native_types(@file_contents.value)
+        data['CFBundleShortVersionString'] = @new_version_number.to_s
+
+        @file_contents.value = CFPropertyList.guess(data)
       end
 
     end

data/resources/apple/TestApp/TestApp/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>200</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

data/spec/versioner/android_spec.rb

@@ -2,6 +2,18 @@ require 'timewizard/versioner/android'
 
 RSpec.describe 'Timewizard::Versioner::Android' do
 
+  before(:example) do
+    pwd = Dir.pwd.to_s
+
+    FileUtils.rm_rf Dir["#{pwd}/tmp"]
+    FileUtils.rm_rf Dir["#{pwd}/pkg"]
+
+    pwd = Dir.pwd.to_s
+    FileUtils.cp_r("#{pwd}/resources/.", "#{pwd}/tmp")
+
+    @versioner = Timewizard::Versioner::Android.new "#{pwd}/tmp/android/AndroidManifest.xml"
+  end
+
   context '.new' do
     it 'should raise error if arg is nil' do
       expect { Timewizard::Versioner::Android.new nil }.to raise_error("passed in file cannot be nil")
@@ -12,14 +24,9 @@ RSpec.describe 'Timewizard::Versioner::Android' do
     end
   end
 
-  before(:example) do
-    @directory = Dir.pwd.to_s
-    @versioner = Timewizard::Versioner::Android.new "#{@directory}/tmp/android/AndroidManifest.xml"
-  end
-
   context '#file' do
     it 'should be an AndroidManifest.xml' do
-      expect(@versioner.file).to eq("#{@directory}/tmp/android/AndroidManifest.xml")
+      expect(@versioner.file).to eq("#{Dir.pwd.to_s}/tmp/android/AndroidManifest.xml")
     end
   end
 
@@ -98,11 +105,6 @@ RSpec.describe 'Timewizard::Versioner::Android' do
       @versioner.read_build_numbers
     end
 
-    after(:example) do
-      @versioner.new_build_number = '200'
-      @versioner.write_build_numbers
-    end
-
     it 'should not raise an error' do
       expect { @versioner.write_version_numbers }.to_not raise_error
     end
@@ -130,11 +132,6 @@ RSpec.describe 'Timewizard::Versioner::Android' do
       @versioner.read_version_numbers
     end
 
-    after(:example) do
-      @versioner.new_version_number = '0.0.1'
-      @versioner.write_version_numbers
-    end
-
     it 'should not raise an error' do
       expect { @versioner.write_version_numbers }.to_not raise_error
     end

data/spec/versioner/apple_spec.rb

@@ -0,0 +1,157 @@
+require 'timewizard/versioner/apple'
+
+RSpec.describe 'Timewizard::Versioner::Apple' do
+
+  context '.new' do
+    it 'should raise error if arg is nil' do
+      expect { Timewizard::Versioner::Apple.new nil }.to raise_error("passed in file cannot be nil")
+    end
+
+    it 'should not raise error if arg is not nil' do
+      expect { Timewizard::Versioner::Apple.new '' }.not_to raise_error
+    end
+  end
+
+  before(:example) do
+    pwd = Dir.pwd.to_s
+    @directory = pwd
+
+    FileUtils.rm_rf Dir["#{pwd}/tmp"]
+
+    FileUtils.cp_r("#{pwd}/resources/.", "#{pwd}/tmp")
+
+    @versioner = Timewizard::Versioner::Apple.new "#{pwd}/tmp/apple/TestApp/TestApp/Info.plist"
+  end
+
+  context '#file' do
+    it 'should be an Info.plist' do
+      expect(@versioner.file).to eq("#{@directory}/tmp/apple/TestApp/TestApp/Info.plist")
+    end
+  end
+
+  context '#old_build_number' do
+    it 'should be nil' do
+      expect(@versioner.old_build_number).to be_nil
+    end
+  end
+
+  context '#old_version_number' do
+    it 'should be nil' do
+      expect(@versioner.old_version_number).to be_nil
+    end
+  end
+
+  context '#new_build_number' do
+    it 'should be nil' do
+      expect(@versioner.new_build_number).to be_nil
+    end
+  end
+
+  context '#new_build_number=' do
+    it 'should change instance variable' do
+      @versioner.new_build_number = '1'
+      expect(@versioner.new_build_number).not_to be_nil
+      @versioner.new_build_number = nil
+      expect(@versioner.new_build_number).to be_nil
+    end
+  end
+
+  context '#new_version_number' do
+    it 'should be nil' do
+      expect(@versioner.new_version_number).to be_nil
+    end
+  end
+
+  context '#new_version_number=' do
+    it 'should change instance variable' do
+      @versioner.new_version_number = '1'
+      expect(@versioner.new_version_number).not_to be_nil
+      @versioner.new_version_number = nil
+      expect(@versioner.new_version_number).to be_nil
+    end
+  end
+
+  context '#read_build_numbers' do
+    it 'should not raise an error' do
+      expect { @versioner.read_build_numbers }.to_not raise_error
+    end
+
+    it 'should change instance variables' do
+      expect(@versioner.old_build_number).to be_nil
+      expect(@versioner.new_build_number).to be_nil
+      @versioner.read_build_numbers
+      expect(@versioner.old_build_number).to eq('200')
+      expect(@versioner.new_build_number).to eq('201')
+    end
+  end
+
+  context '#read_version_numbers' do
+    it 'should not raise an error' do
+      expect { @versioner.read_version_numbers }.to_not raise_error
+    end
+
+    it 'should change instance variables' do
+      expect(@versioner.old_version_number).to be_nil
+      expect(@versioner.new_version_number).to be_nil
+      @versioner.read_version_numbers
+      expect(@versioner.old_version_number).to eq('0.0.1')
+      expect(@versioner.new_version_number).to eq('0.0.1')
+    end
+  end
+
+  context '#write_build_numbers' do
+    before(:example) do
+      @versioner.read_build_numbers
+    end
+
+    it 'should not raise an error' do
+      expect { @versioner.write_version_numbers }.to_not raise_error
+    end
+
+    it 'should not change instance variables' do
+      expect(@versioner.old_build_number).to eq('200')
+      expect(@versioner.new_build_number).to eq('201')
+      @versioner.write_build_numbers
+      expect(@versioner.old_build_number).to eq('200')
+      expect(@versioner.new_build_number).to eq('201')
+    end
+
+    it 'should change contents of parsed file' do
+      expect(@versioner.old_build_number).to eq('200')
+      expect(@versioner.new_build_number).to eq('201')
+      @versioner.write_build_numbers
+      @versioner.read_build_numbers
+      expect(@versioner.old_build_number).to eq('201')
+      expect(@versioner.new_build_number).to eq('202')
+    end
+  end
+
+  context '#write_version_numbers' do
+    before(:example) do
+      @versioner.read_version_numbers
+    end
+
+    it 'should not raise an error' do
+      expect { @versioner.write_version_numbers }.to_not raise_error
+    end
+
+    it 'should not change instance variables' do
+      expect(@versioner.old_version_number).to eq('0.0.1')
+      expect(@versioner.new_version_number).to eq('0.0.1')
+      @versioner.write_version_numbers
+      expect(@versioner.old_version_number).to eq('0.0.1')
+      expect(@versioner.new_version_number).to eq('0.0.1')
+    end
+
+    it 'should change contents of parsed file' do
+      expect(@versioner.old_version_number).to eq('0.0.1')
+      expect(@versioner.new_version_number).to eq('0.0.1')
+      @versioner.new_version_number = '0.0.2'
+      @versioner.write_version_numbers
+      @versioner.read_version_numbers
+      expect(@versioner.old_version_number).to eq('0.0.2')
+      expect(@versioner.new_version_number).to eq('0.0.2')
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timewizard
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.alpha.pre.57
+  version: 0.3.0.pre.alpha.pre.58
 platform: ruby
 authors:
 - Richard Harrah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: versionomy
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: xcodeproj
+  name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
 - spec/timewizard_spec.rb
 - spec/utils/wizardry_spec.rb
 - spec/versioner/android_spec.rb
+- spec/versioner/apple_spec.rb
 - spec/versioner_spec.rb
 - timewizard.gemspec
 homepage: https://github.com/Nunnery/timewizard