timewizard 0.2.4.pre.alpha.pre.41 → 0.3.0.pre.alpha.pre.47

data/lib/timewizard/versioner/apple.rb

@@ -1,115 +1,133 @@
+#
+# Copyright (C) 2015 Richard Harrah <topplethenunnery@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'xcodeproj'
-require 'find'
 require 'versionomy'
+require 'timewizard/versioner'
 require 'timewizard/utils/wizardry'
 
 module Timewizard
   module Versioner
-    class Apple
-      attr_accessor :dir
-      attr_reader :proj
-      attr_reader :plists
-      attr_reader :old_bundle_version
-      attr_reader :old_build_number
-      attr_accessor :new_bundle_version
-      attr_accessor :new_build_number
-
-      def initialize(dir)
-        @dir = dir
-        @proj = nil
-        @plists = []
+    class Apple < Timewizard::Versioner::Base
+
+      #
+      # Public functions (inherited from parent)
+      #
+      public
+
+      def read_build_numbers
+        read_file
+        find_build_numbers
+      end
+
+      def read_version_numbers
+        read_file
+        find_version_numbers
+      end
+
+      def write_build_numbers
+        change_build_numbers
+        write_file
       end
 
-      def find_xcode_project()
-        if @dir.nil?
-          raise "directory cannot be nil"
+      def write_version_numbers
+        change_version_numbers
+        write_file
+      end
+
+      #
+      # Private functions (implementation specific)
+      #
+      private
+
+      def read_file
+        if @file.nil?
+          raise 'file is nil and cannot be read'
         end
-        if @dir.end_with? ".xcodeproj"
-          @proj = File.absolute_path(@dir)
-        else
-          Find.find(@dir) do |path|
-            unless path.to_s.end_with? ".xcodeproj"
-              next
-            end
-            @proj = path
-          end
+
+        @file_contents = {}
+
+        if File.exist?(@file)
+          @file_contents = Xcodeproj::PlistHelper.read @file
         end
-        @proj
+
+        @file_contents
       end
 
-      def find_plists()
-        if @proj.nil?
-          raise "there is no .xcodeproj"
-        end
-        directory = File.dirname(@proj.to_s)
-        unless Dir.exist?(directory)
-          raise "proj is not in a directory"
+      def write_file
+        if @file.nil?
+          raise 'file is nil and cannot be written'
         end
-        @plists = []
-        Find.find(directory) do |p|
-          if /^.*Info\.plist$/ =~ p
-            @plists << p
-          end
+        if @file_contents.nil?
+          raise 'file_contents is nil and cannot be written'
         end
-        @plists
+        Xcodeproj::PlistHelper.write(@file_contents, @file)
       end
 
-      def find_bundle_version(lists)
-        find_bundle_and_build_version(lists)[0]
+      def find_build_numbers
+        find_build_and_version_numbers
+        [@old_build_number, @new_build_number]
       end
 
-      def find_build_number(lists)
-        find_bundle_and_build_version(lists)[1]
+      def find_version_numbers
+        find_build_and_version_numbers
+        [@old_version_number, @new_version_number]
       end
 
-      def change_bundle_version(versions, change_to = '-1')
-        unless change_to != '-1'
-          @new_bundle_version = versions[0]
-          versions
+      def find_build_and_version_numbers
+        if @file_contents.nil?
+          read_file
         end
-        ver = Timewizard::Utils::Wizardry.only_version change_to
-        parsed = Versionomy.parse(ver, Versionomy::Format.get('rubygems'))
-        versions[0] = parsed.unparse
-        @new_bundle_version = versions[0]
-        versions
-      end
 
-      def change_build_number(versions, change_to = '-1')
-        if change_to == '-1'
-          ver = Timewizard::Utils::Wizardry.only_version @old_build_number.to_s
-          parsed = Versionomy.parse(ver, Versionomy::Format.get('rubygems'))
-          parsed = parsed.bump(parsed.parts.length - 1)
-          versions[1] = parsed.unparse
-          @new_build_number = versions[1]
-        else
-          ver = Timewizard::Utils::Wizardry.only_version change_to
-          parsed = Versionomy.parse ver
-          versions[1] = parsed.unparse
-          @new_build_number = versions[1]
-        end
-        versions
-      end
+        build_num = Timewizard::Utils::Wizardry.only_version(@file_contents["CFBundleVersion"]) || '0'
+        version_num = Timewizard::Utils::Wizardry.only_version(@file_contents["CFBundleShortVersionString"]) || '0'
 
-      def find_bundle_and_build_version(lists)
-        versions = []
-        for list in lists do
-          list_hash = Xcodeproj::PlistHelper.read list
-          versions[0] ||= list_hash["CFBundleShortVersionString"]
-          versions[1] ||= list_hash["CFBundleVersion"]
+        parsed_build_num = Versionomy.parse(build_num, Versionomy::Format.get('rubygems'))
+        parsed_version_num = Versionomy.parse(version_num, Versionomy::Format.get('rubygems'))
 
-          @old_bundle_version = versions[0]
-          @old_build_number = versions[1]
+        @old_build_number = parsed_build_num.unparse
+        @old_version_number = parsed_version_num.unparse
+
+        @new_build_number = parsed_build_num.bump(parsed_build_num.parts.length - 1).unparse
+        @new_version_number = @old_version_number
+        self
+      end
+
+      def change_build_numbers
+        if @file_contents.nil?
+          read_file
         end
-        versions
+        if @new_build_number.nil?
+          read_build_numbers
+        end
+        @file_contents["CFBundleVersion"] = @new_build_number.to_s || @file_contents["CFBundleVersion"]
       end
 
-      def write_plists(versions)
-        for list in @plists do
-          list_hash = Xcodeproj::PlistHelper.read list
-          list_hash["CFBundleShortVersionString"] = versions[0] || list_hash["CFBundleShortVersionString"]
-          list_hash["CFBundleVersion"] = versions[0] || list_hash["CFBundleVersion"]
-          Xcodeproj::PlistHelper.write(list_hash, list)
+      def change_version_numbers
+        if @file_contents.nil?
+          read_file
+        end
+        if @new_build_number.nil?
+          read_build_numbers
         end
+        @file_contents["CFBundleShortVersionString"] = @new_build_number.to_s || @file_contents["CFBundleShortVersionString"]
       end
 
     end

data/lib/timewizard/versioner.rb

@@ -1,5 +1,57 @@
+#
+# Copyright (C) 2015 Richard Harrah <topplethenunnery@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 module Timewizard
   module Versioner
+    class Base
+      attr_reader :file
+      attr_reader :old_build_number
+      attr_reader :old_version_number
+      attr_accessor :new_build_number
+      attr_accessor :new_version_number
+
+      def initialize(path_to_file)
+        if path_to_file.nil?
+          raise "passed in file cannot be nil"
+        end
+        @file = path_to_file
+      end
+
+      def read_build_numbers()
+        # do nothing
+      end
+
+      def read_version_numbers()
+        # do nothing
+      end
+
+      def write_build_numbers()
+        # do nothing
+      end
+
+      def write_version_numbers()
+        # do nothing
+      end
+
+    end
+
     autoload :Android, 'timewizard/versioner/android'
     autoload :Apple, 'timewizard/versioner/apple'
   end

data/lib/timewizard.rb

@@ -1,5 +1,21 @@
-require "timewizard/version"
-
-module Timewizard
-  # Your code goes here...
-end
+#
+# Copyright (C) 2015 Richard Harrah <topplethenunnery@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'timewizard/version'

data/spec/spec_helper.rb

@@ -0,0 +1,33 @@
+require 'timewizard'
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
+RSpec.configure do |config|
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  config.disable_monkey_patching!
+
+  config.warnings = true
+
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
+
+  config.profile_examples = 10
+
+  config.order = :random
+
+  Kernel.srand config.seed
+end

data/spec/timewizard_spec.rb

@@ -0,0 +1,5 @@
+RSpec.describe Timewizard do
+  it 'should have a VERSION constant' do
+    expect(Timewizard::VERSION).to_not be_nil
+  end
+end

data/spec/utils/wizardry_spec.rb

@@ -0,0 +1,27 @@
+require 'timewizard/utils/wizardry'
+
+RSpec.describe 'Timewizard::Utils::Wizardry' do
+  context '.only_version' do
+    it 'should raise an error when arg is nil' do
+      expect { Timewizard::Utils::Wizardry.only_version nil }.to raise_error('stringy cannot be null')
+    end
+
+    it 'should return the same value when given a proper version number' do
+      base = '0.0.1'
+
+      expected = '0.0.1'
+      actual = Timewizard::Utils::Wizardry.only_version base
+
+      expect(actual).to eq(expected)
+    end
+
+    it 'should return a version number when given a text string containing a version number' do
+      base = 'this is version 0.0.1'
+
+      expected = '0.0.1'
+      actual = Timewizard::Utils::Wizardry.only_version base
+
+      expect(actual).to eq(expected)
+    end
+  end
+end

data/spec/versioner_spec.rb

@@ -0,0 +1,107 @@
+require 'timewizard/versioner'
+
+RSpec.describe 'Timewizard::Versioner::Base' do
+
+  context '.new' do
+    it 'should raise error if arg is nil' do
+      expect { Timewizard::Versioner::Base.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::Base.new '' }.not_to raise_error
+    end
+  end
+
+  before(:context) do
+    @versioner = Timewizard::Versioner::Base.new ''
+  end
+
+  context '#file' do
+    it 'should be empty string' do
+      expect(@versioner.file).to eq('')
+    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 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 be_nil
+      expect(@versioner.new_build_number).to be_nil
+    end
+  end
+
+  context '#read_version_numbers' do
+    it 'should not 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 be_nil
+      expect(@versioner.new_version_number).to be_nil
+    end
+  end
+
+  context '#write_build_numbers' do
+    it 'should not change instance variables' do
+      expect(@versioner.old_build_number).to be_nil
+      expect(@versioner.new_build_number).to be_nil
+      @versioner.write_build_numbers
+      expect(@versioner.old_build_number).to be_nil
+      expect(@versioner.new_build_number).to be_nil
+    end
+  end
+
+  context '#write_version_numbers' do
+    it 'should not change instance variables' do
+      expect(@versioner.old_version_number).to be_nil
+      expect(@versioner.new_version_number).to be_nil
+      @versioner.write_version_numbers
+      expect(@versioner.old_version_number).to be_nil
+      expect(@versioner.new_version_number).to be_nil
+    end
+  end
+  
+end

data/timewizard.gemspec

@@ -1,29 +1,61 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'timewizard/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "timewizard"
-  spec.version       = Timewizard::VERSION
-  spec.version = "#{spec.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS'] && ENV['TRAVIS_BRANCH'] == 'development'
-  spec.authors       = ["Richard Harrah"]
-  spec.email         = ["topplethenunnery@gmail.com"]
-
-  spec.summary       = %q{A gem for incrementing and decrementing iOS and Android app versions.}
-  spec.homepage      = "https://github.com/Nunnery/timewizard"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
-  spec.add_development_dependency "minitest", "~> 5.8"
-
-  spec.add_dependency "versionomy", "~> 0.4"
-  spec.add_dependency "xcodeproj", "~> 0.26"
-end
+
+require 'yaml'
+
+Gem::Specification.new do |gem|
+  gemspec = YAML.load_file('gemspec.yml')
+
+  gem.name = gemspec.fetch('name')
+  gem.version = gemspec.fetch('version') do
+    lib_dir = File.join(File.dirname(__FILE__), 'lib')
+    $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+
+    require 'timewizard/version'
+    Timewizard::VERSION
+  end
+  gem.version = "#{gem.version}-alpha-#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS_BRANCH'] == 'development'
+
+  gem.summary = gemspec['summary']
+  gem.description = gemspec['description']
+  gem.licenses = Array(gemspec['license'])
+  gem.authors = Array(gemspec['authors'])
+  gem.email = gemspec['email']
+  gem.homepage = gemspec['homepage']
+
+  glob = lambda { |patterns| gem.files & Dir[*patterns] }
+
+  gem.files = `git ls-files`.split($/)
+  gem.files = glob[gemspec['files']] if gemspec['files']
+
+  gem.executables = gemspec.fetch('executables') do
+    glob['bin/*'].map { |path| File.basename(path) }
+  end
+  gem.default_executable = gem.executables.first if Gem::VERSION < '1.7.'
+
+  gem.extensions = glob[gemspec['extensions'] || 'ext/**/extconf.rb']
+  gem.test_files = glob[gemspec['test_files'] || '{test/{**/}*_test.rb']
+  gem.extra_rdoc_files = glob[gemspec['extra_doc_files'] || '*.{txt,rdoc}']
+
+  gem.require_paths = Array(gemspec.fetch('require_paths') {
+                              %w[ext lib].select { |dir| File.directory?(dir) }
+                            })
+
+  gem.requirements = gemspec['requirements']
+  gem.required_ruby_version = gemspec['required_ruby_version']
+  gem.required_rubygems_version = gemspec['required_rubygems_version']
+  gem.post_install_message = gemspec['post_install_message']
+
+  split = lambda { |string| string.split(/,\s*/) }
+
+  if gemspec['dependencies']
+    gemspec['dependencies'].each do |name, versions|
+      gem.add_dependency(name, split[versions])
+    end
+  end
+
+  if gemspec['development_dependencies']
+    gemspec['development_dependencies'].each do |name, versions|
+      gem.add_development_dependency(name, split[versions])
+    end
+  end
+end