timewizard 0.3.0.pre.alpha.pre.56 → 0.3.0.pre.alpha.pre.57

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTdjYWU1MzU5ODc5NWM4Yjg4NTI3ZmEwNDQ0ZGI3NTlmMWE1ZDFjMQ==
+    MDZlMzk4OTdkODc5OGI5YWYzOGZlYzk2NGE5MzZiYTAzMmI5Zjg2NQ==
   data.tar.gz: !binary |-
-    NjcwYjFkNWQ2ZjRlNDQ4MmY3YTg4ZjBmYmJkMGZhYTFmMjU4NGM5ZQ==
+    YjNlMDkxOWFjY2M0NjliYWUzMTdiMGE1YzY3MWQ5ZDNkYTZlMGI0OA==
 SHA512:
   metadata.gz: !binary |-
-    MmNmYTZiN2M1ZWQ2YWVmNDdlYmIyMDYxYjRhYTViZDY2MmQwZjZjZDhiMjll
-    M2E0YTU5YTBkYjc4MTNiZjcwNTdiYmE4MGZkMGQxNTE0ZGFlMmRhN2Q4ZDQ0
-    YmM2MmRlMzA0OWI1ZGRiMmY3ZWQ2MTYwNTNmYjc2OTY3NDQ2MzA=
+    ZmMyMzY4MDc2NzcwODIyN2ZkMWZkZjhjNzY3ZWI5NzAxYmUxMzM0YWFmZDM0
+    ZWYwMWZiYWJhNDBlM2NjNmExMmI4ZDRhNjliMTA5MzNhMTBhNDJhNjkyNjYw
+    MzQ0ZTRiYTI5YzIzNmIyZTBiZDc1Y2Y0ZTU1YTVmMzUxZDQyZjI=
   data.tar.gz: !binary |-
-    NjVmZWRhZjNiMzQ2NjdjNGU2YzkzM2ExZDRmYjdkN2M0NzRkNTdhMTNmNjA4
-    NTgwMTgyZmVmYWM5MTFiOGQzMjQ1NjMxYmUzYmIxYzY0OTA1OTk1OGMxNTQz
-    YzRlNTJhNzZlNjAzYjY5YzhkYzQ0N2E4NzE3ZmQzNzI4NDc0MGU=
+    MjZkNGExMzMzYzhmOTM0Y2ZlMWZlNmE5Mjk0NmE3OGZlYWVlYTExMWQ1ZDdk
+    NzFiYjUwZGY5MTVhMjQzMGEyMGM0MDkxZTFiZTk3YzY5YzEwMzI4YzM5MjMy
+    YTc3NmU2YzlkZTQxMTllZTVkMWFlOWNhYWFiNTFlN2Q2MWQ2YmY=

data/lib/timewizard/utils/wizardry.rb

@@ -7,7 +7,7 @@ module Timewizard
     # @since 0.2.4
     module Wizardry
 
-      VERSION_REGEX = /((\d+\.)?(\d+\.)?(\*|\d+))(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/
+      VERSION_REGEX = /((\d+\.)?(\d+\.)?(\*|\d+))(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?/
 
       # Returns a substring of the passed-in value that matches {Timewizard::Utils::Wizardry::VERSION_REGEX the version regex}.
       # @param [String] stringy string from which to extract version string

data/lib/timewizard/versioner/android.rb

@@ -12,6 +12,8 @@ module Timewizard
       #
       private
 
+      SPACE_REGEX = /\s+/
+
       def read_file
         if @file.nil?
           raise 'file is nil and cannot be read'
@@ -36,16 +38,6 @@ module Timewizard
         File.open(@file, 'w') { |file| file.write(@file_contents) }
       end
 
-      def find_build_numbers
-        find_build_and_version_numbers
-        [@old_build_number, @new_build_number]
-      end
-
-      def find_version_numbers
-        find_build_and_version_numbers
-        [@old_version_number, @new_version_number]
-      end
-
       def find_build_and_version_numbers
         if @file_contents.nil?
           read_file
@@ -53,7 +45,7 @@ module Timewizard
         matched = @file_contents.match "android:versionCode=\"(.*)\""
 
         first_match = matched[0]
-        split_match = first_match.partition /\s+/
+        split_match = first_match.partition(SPACE_REGEX)
 
         build_num = Timewizard::Utils::Wizardry.only_version split_match[0]
         version_num = Timewizard::Utils::Wizardry.only_version split_match[2]
@@ -61,12 +53,12 @@ module Timewizard
         parsed_build_num = Versionomy.parse(build_num, Versionomy::Format.get('rubygems'))
         parsed_version_num = Versionomy.parse(version_num, Versionomy::Format.get('rubygems'))
 
-        @old_build_number = parsed_build_num.unparse
-        @old_version_number = parsed_version_num.unparse
+        obn = parsed_build_num.unparse
+        ovn = parsed_version_num.unparse
+        nbn = parsed_build_num.bump(parsed_build_num.parts.length - 1).unparse
+        nvn = ovn
 
-        @new_build_number = parsed_build_num.bump(parsed_build_num.parts.length - 1).unparse
-        @new_version_number = @old_version_number
-        self
+        [obn, ovn, nbn, nvn]
       end
 
       def change_build_numbers

data/lib/timewizard/versioner/apple.rb

@@ -37,16 +37,6 @@ module Timewizard
         Xcodeproj::PlistHelper.write(@file_contents, @file)
       end
 
-      def find_build_numbers
-        find_build_and_version_numbers
-        [@old_build_number, @new_build_number]
-      end
-
-      def find_version_numbers
-        find_build_and_version_numbers
-        [@old_version_number, @new_version_number]
-      end
-
       def find_build_and_version_numbers
         if @file_contents.nil?
           read_file
@@ -58,12 +48,12 @@ module Timewizard
         parsed_build_num = Versionomy.parse(build_num, Versionomy::Format.get('rubygems'))
         parsed_version_num = Versionomy.parse(version_num, Versionomy::Format.get('rubygems'))
 
-        @old_build_number = parsed_build_num.unparse
-        @old_version_number = parsed_version_num.unparse
+        obn = parsed_build_num.unparse
+        ovn = parsed_version_num.unparse
+        nbn = parsed_build_num.bump(parsed_build_num.parts.length - 1).unparse
+        nvn = ovn
 
-        @new_build_number = parsed_build_num.bump(parsed_build_num.parts.length - 1).unparse
-        @new_version_number = @old_version_number
-        self
+        [obn, ovn, nbn, nvn]
       end
 
       def change_build_numbers

data/lib/timewizard/versioner.rb

@@ -42,6 +42,10 @@ module Timewizard
           raise "passed in file cannot be nil"
         end
         @file = path_to_file
+        @old_build_number = nil
+        @old_version_number = nil
+        @new_build_number = nil
+        @new_version_number = nil
       end
 
       # Reads the build numbers from {Timewizard::Versioner::Base.file}.
@@ -57,6 +61,7 @@ module Timewizard
       def read_version_numbers
         read_file
         find_version_numbers
+        self
       end
 
       # Writes the build numbers to {Timewizard::Versioner::Base.file}.
@@ -64,6 +69,7 @@ module Timewizard
       def write_build_numbers
         change_build_numbers
         write_file
+        self
       end
 
       # Writes the version numbers to {Timewizard::Versioner::Base.file}.
@@ -71,6 +77,7 @@ module Timewizard
       def write_version_numbers
         change_version_numbers
         write_file
+        self
       end
 
       private
@@ -84,11 +91,17 @@ module Timewizard
       end
 
       def find_build_numbers
-        raise NotImplementedError
+        bn = find_build_and_version_numbers
+        @old_build_number = bn[0]
+        @new_build_number = bn[2]
+        [@old_build_number, @new_build_number]
       end
 
       def find_version_numbers
-        raise NotImplementedError
+        vn = find_build_and_version_numbers
+        @old_version_number = vn[1]
+        @new_version_number = vn[3]
+        [@old_version_number, @new_version_number]
       end
 
       def find_build_and_version_numbers

data/spec/utils/wizardry_spec.rb

@@ -23,5 +23,14 @@ RSpec.describe 'Timewizard::Utils::Wizardry' do
 
       expect(actual).to eq(expected)
     end
+
+    it 'should return a version number when version number is in the middle of the string' do
+      base = 'this, 0.0.1, is the version being test'
+
+      expected = '0.0.1'
+      actual = Timewizard::Utils::Wizardry.only_version base
+
+      expect(actual).to eq(expected)
+    end
   end
 end

data/spec/versioner/android_spec.rb

@@ -0,0 +1,161 @@
+require 'timewizard/versioner/android'
+
+RSpec.describe 'Timewizard::Versioner::Android' do
+
+  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")
+    end
+
+    it 'should not raise error if arg is not nil' do
+      expect { Timewizard::Versioner::Android.new '' }.not_to raise_error
+    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")
+    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
+
+    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
+
+    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
+
+    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
+
+    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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timewizard
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.alpha.pre.56
+  version: 0.3.0.pre.alpha.pre.57
 platform: ruby
 authors:
 - Richard Harrah
@@ -170,6 +170,7 @@ files:
 - spec/spec_helper.rb
 - spec/timewizard_spec.rb
 - spec/utils/wizardry_spec.rb
+- spec/versioner/android_spec.rb
 - spec/versioner_spec.rb
 - timewizard.gemspec
 homepage: https://github.com/Nunnery/timewizard