ive 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba6659ffeef58918b087ba34e4c51f7e9d7fb4b
-  data.tar.gz: 3393a6122c68145e7f472dd568077b454aefa660
+  metadata.gz: d75dcf1acb7cf52a6bdafabce418f15704aa3e7d
+  data.tar.gz: 47d1686cb5f8983869816d2d4365f1237e792187
 SHA512:
-  metadata.gz: 4aebcc64b4deb82ebc5683f70d3eb1a9c16c5401c8379f29971cea7bcc09370c2655091ce1190b7eab14f6047912fcc45e609f03e28a3e65048bb09f6d1b3e6d
-  data.tar.gz: 212171dcae1108f362d08e2c9e06e4abf74f7cc5199c3691d4a3d20a808d56755bf198ed1bdebd3beb15b1348ce0d77828dbfd1b64d33850daad653b89b2cb98
+  metadata.gz: 33049d8b95e2bd35202800d808a61b6862b44fd6594bc30847b0c884b3991c639f314296c1697baa8b9e9be788e9493cb650ffd2b3d89294ef7a468062da4591
+  data.tar.gz: e6146beb98cd7a80bc0191faf8886a4b6f829b3fe19f22f8beb439e87f09c64f09a981c48f46f892c0518333690b82ee8a494534bc58d6cee7e9bf10f82707e1

data/README.md

@@ -47,15 +47,20 @@ You can also supply the path of the project root if needed. Just pass the _-p_ (
 
 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"
-
 If a .ive configuration file is missing you can easlily generate one with his command.
 
     ive setup
 
+Choosing the target/configuration to version bump can also be set. There is a _--configuration_ (or _-c_ in short) and a _--target_ (or _-t_) parameter that can be set the same way you set the path.
+
+   ive major -c Release
+   ive major --configuration Release
+
+The code above will make sure the _Release_ configuration is used by **Ive**. The same can be done for the target as shown below.
+
+   ive major -t AppTargetName
+   ive major --target AppTargetName
+
 It's also possible to check out the current version.
 
     ive version

data/bin/ive

@@ -14,23 +14,35 @@ class IveRunner < Thor
   %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"
+    method_option :target, :aliases => "-t", :desc => "Supply the target to set the #{type} version"
+    method_option :configuration, :aliases => "-c", :desc => "Supply the configuration to set the #{type} version"
     define_method type do
       ENV["IVE_PATH"] = options[:path]
+      ENV["IVE_TARGET"] = options[:target]
+    ENV["IVE_CONFIGURATION"] = options[:configuration]
       Ive::Base.new.bump type, git?
     end
   end
 
   desc "version", "Show the current project version."
   method_option :path, :aliases => "-p", :desc => "Supply the path where the project is located"
+  method_option :target, :aliases => "-t", :desc => "Supply the target to read the version"
+  method_option :configuration, :aliases => "-c", :desc => "Supply the configuration to read the version"
   def version
     ENV["IVE_PATH"] = options[:path]
+    ENV["IVE_TARGET"] = options[:target]
+    ENV["IVE_CONFIGURATION"] = options[:configuration]
     Ive::Base.new.version
   end
 
   desc "init", "Initialize the version to 1.0.0 for the current project."
   method_option :path, :aliases => "-p", :desc => "Supply the path where the project is located"
+  method_option :target, :aliases => "-p", :desc => "Supply the target to initialize the version"
+  method_option :configuration, :aliases => "-c", :desc => "Supply the configuration to initialize the version"
   def init
     ENV["IVE_PATH"] = options[:path]
+    ENV["IVE_TARGET"] = options[:target]
+    ENV["IVE_CONFIGURATION"] = options[:configuration]
     Ive::Base.new.initialize_version git?
   end
 

data/lib/ive/configuration.rb

@@ -3,8 +3,8 @@ require "yaml"
 
 module Ive
   class Configuration
-    attr :target
-    attr :configuration
+    attr :targets
+    attr :configurations
 
     def initialize
       self.read_config if self.exists?
@@ -17,13 +17,18 @@ module Ive
     def read_config
       params = YAML::load File.open(self.config_path)
       if params
-        @target = params["target"]
-        @configuration = params["configuration"]
+        @targets = params.keys
+        @configurations = params
       end
     end
 
     def valid?
-      @target && @configuration
+      return false unless @targets 
+      return false unless @targets.count > 0 
+      return false unless @configurations 
+      values = @configurations.values.select { |v| v.count > 0 }
+      return false if values.empty?
+      true
     end
 
     def exists?
@@ -35,10 +40,7 @@ module Ive
     end
 
     def initial_content xcode_params
-      <<TEXT
-target: "#{xcode_params[:target]}"
-configuration: "#{xcode_params[:configuration]}"
-TEXT
+      xcode_params.to_yaml
     end
   end
 end

data/lib/ive/version.rb

@@ -1,3 +1,3 @@
 module Ive
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/ive/xcode.rb

@@ -5,21 +5,38 @@ module Ive
     def config
       return nil unless Ive.config.valid?
 
-      project.target(Ive.config.target).config(Ive.config.configuration)
+      target = ENV["IVE_TARGET"] || Ive.config.targets.first
+      contains_target = !project.targets.detect { |t| t.name == target }.nil?
+      puts "-- Target '#{target}' not found in the project." unless contains_target
+
+      configuration = ENV["IVE_CONFIGURATION"] || Ive.config.configurations[target].first
+      project_target = project.target(target)
+      contains_configuration = !project_target.configs.detect { |c| c.name == configuration }.nil?
+      puts "-- Configuration '#{configuration}' not found for Target '#{target}' in the project." unless contains_configuration
+
+      project_configuration = project_target.config(configuration)
+      puts "-- Used the '#{target}' Target with the '#{configuration}' configuration."
+      project_configuration
     rescue Exception => e
-      puts "-- #{e.message}"
+      puts "-- #{e.message}" unless e.class == NoMethodError
       nil
     end
 
     def initial_config
-      if project.targets.count > 0 && (target = project.targets.first)
-        if target.configs.count > 0 && (config = target.configs.first)
-          { target: target.name, configuration: config.name }
+      config_hash = {}
+      project.targets.each do |target|
+        if target.configs.count > 0
+          config_hash[target.name] = target.configs.map(&:name)
         else
           puts "-- No configurations found for target '#{target.name}' in the current project"
         end
+      end
+
+      if config_hash.empty?
+        puts "-- No targets found in the current project" 
+        nil
       else
-        puts "-- No targets found in the current project"
+        config_hash
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ive
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jelle Vandebeeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler