timewizard 0.3.5 → 0.3.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWY1NDgxOTA5OWNkZTY1MTY3NDhlNGQzOTVlZGYyMmJjN2FmYWFiZg==
+    ZGUzNTAyNGY0MTU3ZDc3NjdiNDJkOWVjMWQ5NjZhMjA3NTNjOWRiYg==
   data.tar.gz: !binary |-
-    YzQ2ZmI1YWEzZWIzYzc2ZTVkYzViM2E4OGM5NTc5NGRmNTVhMzNmOA==
+    MWQ4NmM2ZTZiNTQ3NWM4YWZlN2YzNTdkNTFjNTBhMjNmYzMwMmE4Mw==
 SHA512:
   metadata.gz: !binary |-
-    NDZhYTE3NGE5YzZhOTRmMTkwYmY5YTVlZWUzNmM5N2UyOTM3MjJhNTFkYzcy
-    MzAwZGJhYjI2Y2YzNjBhODU3YTRhMjIwZmI0NGZiNjEyOWI2N2Y1ZWQzNzdl
-    NjU4ZmUwMjQwYTJmYjZlNzMxNjFiYzEyMjVlOTVjMzJkNzBlYmI=
+    ODFkYjM1MDQ1MWUyZjNiZTkzMjgxYzFhMjkxZjMzNWYxNWM0YTJhYzgyYTc4
+    Y2RlYWVjMTYwNDJhMmZjNGYwMDk2MGQzMGM4MWNhOTVjZTBhZGMyNzhiYjg4
+    ZjUwYzM5MWY4MjE4MGJiZmI5YWViOGZmYmNmZjFkOGU1OWZiNDA=
   data.tar.gz: !binary |-
-    YjVjMjUwMTVlZGFmNDU0MzRhYTI4NjEzYzVkODg2Y2E3NTFiNTIxMTI3ZDFm
-    ZWIyNTFjODYzYjg3MDk1YTU5OGJhYTAzOWQ4ODZlZTU4MjdjMjM3NTM0NDc2
-    MjNjMGNlMGFhZTVhMjIwMmI3YmU5ZDBhZmRiZDExYWIzZjM1OGM=
+    YzFkZTE2NDRkYjI0MzUxOTc5NTJmZTIwMTJkZGI2Zjk3OWQyM2Y4MDBmNTBi
+    ZWUyOWQ2NzBiZWFkMjljMzZiOTQyZmI0ZTgzYzQ5ZjdiNWFkNzg4NzQwYjBj
+    YjM0NDJmYjU3ODdlMTYyN2MyN2UxNDNkYWM5MWQyYjg5YTZjMjQ=

data/lib/timewizard/version.rb

@@ -3,5 +3,5 @@
 module Timewizard
   # Version of this gem.
   # @return [String] current version
-  VERSION = "0.3.5"
+  VERSION = "0.3.7"
 end

data/lib/timewizard/versioner/android.rb

@@ -1,3 +1,4 @@
+require 'nokogiri'
 require 'timewizard/versioner'
 
 module Timewizard
@@ -23,16 +24,19 @@ module Timewizard
       private
 
       SPACE_REGEX = /\s+/
+      NAMESPACE = 'android'
+      VERSION_CODE = 'versionCode'
+      VERSION_NAME = 'versionName'
 
       def read_file
         if @file.nil?
           raise 'file is nil and cannot be read'
         end
 
-        @file_contents = ''
+        @file_contents = Nokogiri.XML('')
 
         if File.exist?(@file)
-          @file_contents = File.open(@file, 'r+') { |f| f.read }
+          @file_contents = File.open(@file, 'r+') { |f| Nokogiri.XML(f) }
         end
 
         @file_contents
@@ -45,20 +49,21 @@ module Timewizard
         if @file_contents.nil?
           raise 'file_contents is null and cannot be written'
         end
-        File.open(@file, 'w') { |file| file.write(@file_contents) }
+        File.open(@file, 'w') { |f| @file_contents.write_xml_to(f) }
       end
 
       def find_build_and_version_numbers
         if @file_contents.nil?
           read_file
         end
-        matched = @file_contents.match "android:versionCode=\"(.*)\""
 
-        first_match = matched[0]
-        split_match = first_match.partition(SPACE_REGEX)
+        manifest = @file_contents.at_xpath('//manifest')
+
+        manifest_attr_vc = manifest[NAMESPACE + ':' + VERSION_CODE]
+        manifest_attr_vn = manifest[NAMESPACE + ':' + VERSION_NAME]
 
-        build_num = Timewizard::Utils::Wizardry.only_version split_match[0]
-        version_num = Timewizard::Utils::Wizardry.only_version split_match[2]
+        build_num = Timewizard::Utils::Wizardry.only_version manifest_attr_vc
+        version_num = Timewizard::Utils::Wizardry.only_version manifest_attr_vn
 
         parsed_build_num = Versionomy.parse(build_num, Versionomy::Format.get('rubygems'))
         parsed_version_num = Versionomy.parse(version_num, Versionomy::Format.get('rubygems'))
@@ -81,7 +86,9 @@ module Timewizard
         if @new_build_number.nil?
           read_build_numbers
         end
-        @file_contents.gsub!(@old_build_number.to_s, @new_build_number.to_s)
+        manifest = @file_contents.at_xpath('//manifest')
+
+        manifest[NAMESPACE + ':' + VERSION_CODE] = @new_build_number.to_s
       end
 
       def change_version_numbers
@@ -91,7 +98,9 @@ module Timewizard
         if @new_version_number.nil?
           read_version_numbers
         end
-        @file_contents.gsub!(@old_version_number.to_s, @new_version_number.to_s)
+        manifest = @file_contents.at_xpath('//manifest')
+
+        manifest[NAMESPACE + ':' + VERSION_NAME] = @new_version_number.to_s
       end
 
     end

data/lib/timewizard/versioner/apple.rb

@@ -44,6 +44,7 @@ module Timewizard
         if @file_contents.nil?
           raise 'file_contents is nil and cannot be written'
         end
+        @file_contents.formatted = true
         @file_contents.save(@file)
       end
 
@@ -99,4 +100,4 @@ module Timewizard
 
     end
   end
-end
+end

data/lib/timewizard/versioner/worklight.rb

@@ -1,3 +1,4 @@
+require 'nokogiri'
 require 'timewizard/versioner'
 
 module Timewizard
@@ -29,10 +30,10 @@ module Timewizard
           raise 'file is nil and cannot be read'
         end
 
-        @file_contents = ''
+        @file_contents = Nokogiri.XML('')
 
         if File.exist?(@file)
-          @file_contents = File.open(@file, 'r+') { |f| f.read }
+          @file_contents = File.open(@file, 'r+') { |f| Nokogiri.XML(f) }
         end
 
         @file_contents
@@ -45,27 +46,30 @@ module Timewizard
         if @file_contents.nil?
           raise 'file_contents is null and cannot be written'
         end
-        File.open(@file, 'w') { |file| file.write(@file_contents) }
+        File.open(@file, 'w') { |f| @file_contents.write_xml_to(f) }
       end
 
       def find_build_and_version_numbers
         if @file_contents.nil?
           read_file
         end
-        matched = @file_contents.match "version=\"(.*)\">"
 
-        first_match = matched[0]
-        split_match = first_match.partition(SPACE_REGEX)
+        iphone = @file_contents.at_css('application iphone')
+        android = @file_contents.at_css('application android')
+
+        iphone_version_num = iphone['version']
+        android_version_num = android['version']
 
-        build_num = Timewizard::Utils::Wizardry.only_version split_match[0]
+        parsed_iphone_num = Versionomy.parse(iphone_version_num, Versionomy::Format.get('rubygems'))
+        parsed_android_num = Versionomy.parse(android_version_num, Versionomy::Format.get('rubygems'))
 
-        parsed_build_num = Versionomy.parse(build_num, Versionomy::Format.get('rubygems'))
+        parsed_version_num = parsed_android_num > parsed_iphone_num ? parsed_android_num : parsed_iphone_num
 
-        @bumped_build_number = parsed_build_num.bump(parsed_build_num.parts.length - 1)
+        @bumped_version_number = parsed_version_num.bump(parsed_version_num.parts.length - 1)
 
-        obn = parsed_build_num.unparse
-        ovn = parsed_build_num.unparse
-        nbn = parsed_build_num.bump(parsed_build_num.parts.length - 1).unparse
+        obn = parsed_version_num.unparse
+        ovn = parsed_version_num.unparse
+        nbn = parsed_version_num.bump(parsed_version_num.parts.length - 1).unparse
         nvn = ovn
 
         [obn, ovn, nbn, nvn]
@@ -78,7 +82,8 @@ module Timewizard
         if @new_build_number.nil?
           read_build_numbers
         end
-        @file_contents.gsub!(@old_build_number.to_s, @new_build_number.to_s)
+        # don't actually want to do anything for build numbers for worklight
+        nil
       end
 
       def change_version_numbers
@@ -88,7 +93,11 @@ module Timewizard
         if @new_version_number.nil?
           read_version_numbers
         end
-        @file_contents.gsub!(@old_version_number.to_s, @new_version_number.to_s)
+        iphone = @file_contents.at_css('application iphone')
+        android = @file_contents.at_css('application android')
+
+        iphone['version'] = @new_version_number.to_s
+        android['version'] = @new_version_number.to_s
       end
 
     end

data/resources/android/AndroidManifest.xml

@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="timewizard" android:versionCode="200" android:versionName="0.0.1" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="timewizard" android:versionCode="200"
+          android:versionName="0.0.1">
+</manifest>

data/timewizard.gemspec

@@ -23,8 +23,9 @@ Gem::Specification.new do |gem|
   gem.test_files = glob['{spec/{**/}*_spec.rb']
   gem.extra_rdoc_files = glob['*.{txt,rdoc}']
 
-  gem.add_dependency 'versionomy', '~> 0.4'
   gem.add_dependency 'CFPropertyList', '~> 2.3'
+  gem.add_dependency 'nokogiri', '~> 1.6.6'
+  gem.add_dependency 'versionomy', '~> 0.4'
 
   gem.add_development_dependency 'bundler', '~> 1.10'
   gem.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: timewizard
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Richard Harrah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: versionomy
+  name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: CFPropertyList
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.6.6
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement