ive 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee418327677d638308f90ce37eceb61c6483a42
-  data.tar.gz: 1f3afa891ff04bef5421439dc7c5d19d2894f75b
+  metadata.gz: 015d8fb59ae4758db9508bae233722c8c5238c89
+  data.tar.gz: d6042d5742f343f72be768608e4dd911fff2a4d1
 SHA512:
-  metadata.gz: 74b6314623b578fc7f3282946b78fc1ab7aa530078eecee2f1ac1850ff95b2a3df4bd3b1c757512f89db759ec23610f007aed769991e8fb4b04204095906f0ae
-  data.tar.gz: 91b40eccac67a67da55cd986f12ff4f4fa33b45b3c7b2de76e3608ddf805fbc88f451cf58947eae41759ebf2ecfb368e09ff14e871cf8497e9b9304d300bd364
+  metadata.gz: 6803bc25f0215b93856bf3720906498ef534a3ef24a84e8cb4aaa5e298bba90ae0a7c5f4b24822e44a978b17018206ed573b72ab3578952a23944245b958c28f
+  data.tar.gz: 333ed3d51bd9b654f2fede17eef82cce1c1cff54762b621fb5de7a40c63e4764f36b165f26f7a70b28b59accbd77c9d8cf76af9ee11e3d0a43adeee64aa1788d

data/README.md

@@ -6,7 +6,7 @@ The current bumps are supported by Ive:
 - **Major** _Go from 1.0.0 to 2.0.0_
 - **Minor** _Go from 1.0.0 to 1.1.0_
 - **Patch** _Go from 1.0.0 to 1.0.1_
-- **Build** _Go from 1.0.0-100000 to 1.0.0-100001_
+- **Build** _Go from 1.0.0-0001 to 1.0.0-0002_
 
 And you can even automatically tag the current commit with this lastest version bump.
 
@@ -28,17 +28,34 @@ Or install it yourself as:
 
 It's really simple to use. Just run anh of the following commands in the Terminal from the project root in order to bump.
 
-    ivo bump:major
-    ivo bump:minor
-    ivo bump:patch
-    ivo bump:build
+    ive major
+    ive minor
+    ive patch
+    ive build
 
 To tag the commit add the _--git_ parameter.
 
-    ivo bump:major --git
-    ivo bump:minor --git
-    ivo bump:patch --git
-    ivo bump:build --git
+    ive major --git
+    ive minor --git
+    ive patch --git
+    ive build --git
+
+You can also supply the path of the project root if needed. Just pass the _-p_ (or _--path_) parameter.
+
+    ive major -p ~/Project
+    ive major --path ~/Project
+
+You can also specify the target/configuration you want to bump the version by adding an extra _.ive_ file in the project root. This file should contain a valid target and configuration in order to be used.
+
+Here is an example of the configuration file.
+
+    target: "TheProject"
+    configuration: "Debug"
+
+It's also possible to check out the current version.
+
+    ive version
+    ive version -p ~/Project
 
 ## Contributing
 

data/bin/ive

@@ -8,20 +8,23 @@ class IveRunner < Thor
 
   desc "list", "Show all the possible version bumps."
   def list
-    Ive::Base.list
+    Ive::Base.new.list
   end
 
   %i(major minor patch build).each do |type|
     desc type, "Perform a #{type} version bump."
     method_option :path, :aliases => "-p", :desc => "Supply the path where the project is located"
     define_method type do
-      Ive::Base.bump type, options[:path], git?
+      ENV["IVE_PATH"] = options[:path]
+      Ive::Base.new.bump type, git?
     end
   end
 
   desc "version", "Show the current project version."
-  def version(path)
-    Ive::Base.version path
+  method_option :path, :aliases => "-p", :desc => "Supply the path where the project is located"
+  def version
+    ENV["IVE_PATH"] = options[:path]
+    Ive::Base.new.version
   end
 
   private

data/lib/ive.rb

@@ -2,6 +2,17 @@ require "ive/version"
 require "ive/base"
 require "ive/bump"
 require "ive/git"
+require "ive/configuration"
+require "ive/xcode"
 
 module Ive
+  class << self
+    def config
+      @config ||= Configuration.new
+    end
+
+    def path
+      ENV["IVE_PATH"] || Dir.pwd
+    end
+  end
 end

data/lib/ive/base.rb

@@ -1,9 +1,7 @@
 require "xcoder"
-require "yaml"
 
 module Ive
   class Base
-    class << self
       def list
         puts "-- Ive supports the following version bumps:"
         puts "- major"
@@ -12,72 +10,30 @@ module Ive
         puts "- build"
       end
 
-      def bump(type, path, with_git=false)
-        path = Dir.pwd unless path
-        puts "-- Using the current project: #{path}"
-
-        if project = xcode_project(path)
-          config = config project, path
-          return if config.nil?
-
-          puts "-- Tagging and commiting enabled: #{with_git ? "yes" : "no"}"
-          if with_git
-            if Git.changes?(path)
+      def bump(type, git=false)
+        if config = Ive::Xcode.new.config
+          if git
+            if Git.changes?
               puts "-- This repository has uncommited changes please commit these changes before performing a version bump."
-              return
             else
-              Git.commit path, Ive::Bump.public_send(type, config, with_git)
+              version = Bump.public_send(type, config)
+              Git.commit version
             end
           else
-            Ive::Bump.public_send type, config, with_git
+            Bump.public_send(type, config)
           end
         else
           puts "-- No project file found"
         end
       end
 
-      def version path
-        puts "-- Using the current project: #{path}"
-        if project = xcode_project(path)
-          config = config project, path
+      def version
+        if config = Ive::Xcode.new.config
           puts "-- Version #{config.info_plist.marketing_version}"
           puts "-- Build version #{config.info_plist.version}"
         else
           puts "-- No project file found"
         end
       end
-
-      private
-
-      def xcode_project path
-        project_path = Dir.glob("#{path}/*.xcodeproj").first
-        Xcode.project project_path
-      end
-
-      def config project, path
-        if config_file?(path) && valid_config?(path)
-          config = config_file path
-          project.target(config["target"]).config(config["configuration"])
-        else
-          project.targets.first.config(:Debug)
-        end
-      rescue Exception => e
-        puts "-- #{e}"
-        nil
-      end
-
-      def config_file? path
-        File.exists?(File.join(path,'.ive'))
-      end
-
-      def config_file path
-        YAML::load(File.open(File.join(path,'.ive')))
-      end
-
-      def valid_config? path
-        config = config_file path
-        config["target"] && config["configuration"]
-      end
     end
-  end
 end

data/lib/ive/bump.rb

@@ -3,23 +3,19 @@ require "versionomy"
 module Ive
   class Bump
     class << self
-      def major(config, with_git=false)
-        puts "-- Bumping version"
+      def major(config)
         bumped_version config, :major
       end
 
-      def minor(config, with_git=false)
-        puts "-- Bumping version"
+      def minor(config)
         bumped_version config, :minor
       end
 
-      def patch(config, with_git=false)
-        puts "-- Bumping version"
+      def patch(config)
         bumped_version config, :tiny
       end
 
-      def build(config, with_git=false)
-        puts "-- Bumping build version"
+      def build(config)
         bumped_build_version config
       end
 
@@ -34,8 +30,6 @@ module Ive
         end
 
         new_version = "v#{config.info_plist.marketing_version}"
-        puts "-- New version: #{config.info_plist.marketing_version}"
-        puts "-- New build version: #{config.info_plist.version}"
         new_version
       end
 
@@ -46,8 +40,6 @@ module Ive
           info.version = build_version_from info.marketing_version, new_build_version + 1
           info.save
         end
-
-        puts "-- New build version: #{config.info_plist.version}"
       end
 
       def build_version_from version, count

data/lib/ive/configuration.rb

@@ -0,0 +1,38 @@
+require "ostruct"
+require "yaml"
+
+module Ive
+  class Configuration
+    attr :target
+    attr :configuration
+
+    def initialize
+      if self.exists?
+        self.read_config
+        unless self.valid?
+          puts "-- Invalid .ive config file."
+        end
+      else
+        puts "-- No .ive config file found."
+      end
+    end
+
+    def read_config
+      params = YAML::load File.open(self.config_path)
+      @target = params["target"]
+      @configuration = params["configuration"]
+    end
+
+    def valid?
+      @target && @configuration
+    end
+
+    def exists?
+      File.exists?(self.config_path)
+    end
+
+    def config_path
+      @config_path ||= File.join(Ive.path,'.ive')
+    end
+  end
+end

data/lib/ive/git.rb

@@ -3,13 +3,13 @@ require "git"
 module Ive
   class Git
     class << self
-      def changes? path
-        git = ::Git.open path
+      def changes?
+        git = ::Git.open Ive.path
         git.status.changed.count > 0
       end
 
-      def commit path, version
-        git = ::Git.open path
+      def commit version
+        git = ::Git.open Ive.path
         git.add all: true
         git.commit "Version bump"
         git.add_tag version

data/lib/ive/version.rb

@@ -1,3 +1,3 @@
 module Ive
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/lib/ive/xcode.rb

@@ -0,0 +1,21 @@
+require "xcoder"
+
+module Ive
+  class Xcode
+    def config
+      return nil unless Ive.config.valid?
+
+      project.target(Ive.config.target).config(Ive.config.configuration)
+    #rescue Exception => e
+      #nil
+    end
+
+    def project
+      @project ||= ::Xcode.project self.project_path
+    end
+
+    def project_path
+      @project_path ||= Dir.glob("#{Ive.path}/*.xcodeproj").first
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ive
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jelle Vandebeeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,8 +113,10 @@ files:
 - lib/ive.rb
 - lib/ive/base.rb
 - lib/ive/bump.rb
+- lib/ive/configuration.rb
 - lib/ive/git.rb
 - lib/ive/version.rb
+- lib/ive/xcode.rb
 homepage: https://github.com/fousa/ive
 licenses:
 - MIT