xcake 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f6a0f981501faed86c3570a6872591d473bce8f
-  data.tar.gz: b63c7d010a83973b762952b6539f991f7359f6d7
+  metadata.gz: 15ae8927c93b407871e67a817c72925d9f15a1e3
+  data.tar.gz: 25e31bc7f9c9e1cddd9aced2237b0020391d8046
 SHA512:
-  metadata.gz: da62235a77678a17e30f98f56380e8258a93fa1e7bb2ca92d3efa2bcb26a0341a02e5707e0f3f603e6de4a69838e352c59793db89babc8298dd9c150c4790e99
-  data.tar.gz: 3ff723dc38d043a4cffc0cbd58a37b530cf5b1d4906ef2ec3e46d0b50676db0d1d684836668055f91769c5c3300157fd5b988678e2974bc32a19a4d49050e356
+  metadata.gz: db7173db7391ba932be4fd4b61d7a6212834ae7a20d894231b7a78246e70618611376599dbbf6e913a0150ab78c86122882bed9317ec71cd794cce420fe478a5
+  data.tar.gz: 33cafc01d11a285895317027a0eaf92342b9b54be77d792e896231cefb7ec5adcb4b8d20c7a2d5c890c9dbb8e17f93e28e621df62f5e8877bb67aa8c9db93dd7

data/.gitignore

@@ -33,3 +33,6 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# Mac file metadata files
+.DS_Store

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.6.8
+======
+- Improvements to setting build settings on all configurations (Thanks to @therealbnut).
+
 v0.6.7
 ======
 - Fixes issue where `agvtool` command line tool failed to find plist with the default value used for the `INFOPLIST_FILE` build setting.

data/Gemfile.lock

@@ -17,6 +17,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    ast (2.2.0)
     claide (0.9.1)
     coderay (1.1.1)
     colored (1.2)
@@ -37,13 +38,17 @@ GEM
     minitest (5.8.4)
     molinillo (0.4.4)
     necromancer (0.3.0)
+    parser (2.3.1.0)
+      ast (~> 2.2)
     pastel (0.5.3)
       equatable (~> 0.5.0)
       tty-screen (~> 0.4.3)
+    powerpack (0.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    rainbow (2.1.0)
     rake (10.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -58,6 +63,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.0)
     simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -106,6 +118,7 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uber (0.0.15)
+    unicode-display_width (1.0.5)
     unicode_utils (1.4.0)
     verse (0.4.0)
       unicode_utils (~> 1.4.0)
@@ -124,8 +137,9 @@ DEPENDENCIES
   pry (~> 0.10)
   rake (~> 10.0)
   rspec (~> 3.4.0)
+  rubocop (~> 0.39.0)
   xcake!
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

data/docs/Cakefile.md

@@ -18,7 +18,7 @@ and here is much more complicated one:
 
   application_for :ios, 8.0 do |target|
     target.name = "test"
-    target.all_configurations.supported_devices = :iphone_only
+    target.all_configurations.each { |c| c.supported_devices = :iphone_only }
 
     unit_tests_for target
   end
@@ -259,7 +259,7 @@ We can apply a particular shared setting across all of our configurations.
 Xcake provides a simply way of doing this via an "all" configuration.
 
 ```ruby
-all_configurations.supported_devices = :iphone_only
+all_configurations.each { |c| c.supported_devices = :iphone_only }
 ```
 
 ### Targets
@@ -269,7 +269,7 @@ target we want to modify the configuration for.
 
 ```ruby
 
-target.all_configurations.supported_devices = :iphone_only
+target.all_configurations.each { |c| c.supported_devices = :iphone_only }
 
 debug_configuration :staging do |configuration|
   configuration.settings["KEY"] = "VALUE"

data/lib/xcake/configurable.rb

@@ -15,41 +15,31 @@ module Xcake
 
     private
 
-    attr_accessor :all_configuration
+    attr_accessor :all_configurations
 
     public
 
     attr_accessor :debug_configurations
     attr_accessor :release_configurations
 
-    # This collects all of the configurations,
-    # flattens them and returns them as an array.
+    # @return [Array<Configuration>] list of configurations
     #
-    # The process of flattening combines each
-    # configuration settings with the defaults
-    # and shared "all" settings, in this priority:
-    #
-    # - default settings
-    # - shared settings
-    # - configuration settings
-    #
-    # @return [Array<Configuration>] list of all configurations flattened
-    #
-    def flatten_configurations
-      all_settings = all_configurations.settings
-      flattened_configurations = []
+    def all_configurations
+      configurations = []
 
-      debug_configurations.each do |b|
-        b.settings = default_debug_settings.merge!(all_settings).merge!(b.settings)
-        flattened_configurations << b
+      if debug_configurations.empty?
+        configurations << debug_configuration("Debug")
+      else
+        configurations.concat(debug_configurations)
       end
 
-      release_configurations.each do |b|
-        b.settings = default_release_settings.merge!(all_settings).merge!(b.settings)
-        flattened_configurations << b
+      if release_configurations.empty?
+        configurations << release_configuration("Release")
+      else
+        configurations.concat(release_configurations)
       end
 
-      flattened_configurations
+      configurations
     end
 
     # @return [Array<Configuration>] list of debug configurations
@@ -64,23 +54,6 @@ module Xcake
       @release_configurations ||= []
     end
 
-    # This returns the shared "all" configuration
-    # use this if you want to set a setting that
-    # applies across all configurations.
-    #
-    # Note: If this setting is set on a configuration
-    # already then this won't override it.
-    #
-    # @example Set a setting across all configurations
-    #
-    #     t.all_configurations.settings["INFO_PLIST"] = "./myapp/info.plist"
-    #
-    # @return [Configuration] configuration for the shared settings
-    #
-    def all_configurations
-      @all_configuration ||= Configuration.new(:all)
-    end
-
     # This either finds a release configuration
     # with the same name or creates one.
     #
@@ -102,28 +75,37 @@ module Xcake
     private
 
     def build_configuration(method, name, &block)
-      configuration_name = send("#{method}_configurations")
+      case method
+      when :debug
+        configuration_name = debug_configurations
+        default_settings = default_debug_settings
+      when :release
+        configuration_name = release_configurations
+        default_settings = default_release_settings
+      end
+
       if name.nil?
-        configuration = configuration_name.first
+        build_configuration = configuration_name.first
       else
-        configuration = configuration_name.detect do |c|
+        build_configuration = configuration_name.detect do |c|
           c.name == name.to_s
         end
       end
 
-      if configuration.nil?
+      if build_configuration.nil?
         if name.nil?
           name = method.to_s[0].upcase + method.to_s[1..-1]
         end
 
-        configuration = Configuration.new(name) do |b|
+        build_configuration = Configuration.new(name) do |b|
+          b.settings.merge!(default_settings)
           block.call(b) if block_given?
         end
 
-        configuration_name << configuration
+        configuration_name << build_configuration
       end
 
-      configuration
+      build_configuration
     end
   end
 end

data/lib/xcake/configuration/sugar.rb

@@ -18,7 +18,9 @@ module Xcake
     # @example Using Supported Devices
     #
     #          Target.new do |t|
-    #             t.all_configurations.supported_devices = :ipad_only
+    #             t.all_configurations.each do |c|
+    #                c.supported_devices = :ipad_only
+    #             end
     #          end
     #
     def supported_devices=(devices)

data/lib/xcake/generator/configuration_generator.rb

@@ -21,7 +21,7 @@ module Xcake
     def create_build_configurations_for(configuration_object)
       puts "Creating build configurations for #{configuration_object}..."
 
-      configuration_object.flatten_configurations.each do |configuration|
+      configuration_object.all_configurations.each do |configuration|
         puts "Creating build configuration #{configuration.name} for #{configuration_object}..."
 
         build_configuration = @context.native_object_for(configuration)

data/lib/xcake/project/sugar.rb

@@ -63,8 +63,13 @@ module Xcake
         t.deployment_target = host_target.deployment_target
         t.language = host_target.language
 
-        t.all_configurations.settings["TEST_HOST"] = "$(BUILT_PRODUCTS_DIR)/#{host_target.name}.app/#{host_target.name}"
-        t.all_configurations.settings["BUNDLE_LOADER"] = "$(TEST_HOST)"
+        host_path = "#{host_target.name}.app/#{host_target.name}"
+        t.all_configurations.each do |c|
+          c.settings["TEST_HOST"] = "$(BUILT_PRODUCTS_DIR)/#{host_path}"
+        end
+        t.all_configurations.each do |c|
+          c.settings["BUNDLE_LOADER"] = "$(TEST_HOST)"
+        end
 
         block.call(t) if block_given?
       end

data/lib/xcake/resources/Cakefile

@@ -18,13 +18,13 @@ application_for :ios, 8.0 do |target|
 
     #Update these with the details of your app
     target.name = "YourApp"
-    target.all_configurations.product_bundle_identifier = "com.yourcompany.yourapp"
+    target.all_configurations.each { |c| c.product_bundle_identifier = "com.yourcompany.yourapp"}
 
     # Uncomment to target iPhone devices only
     #
     # File patterns can be seen here https://guides.cocoapods.org/syntax/podspec.html#group_file_patterns
     #
-    #target.all_configurations.supported_devices = :iphone_only
+    #target.all_configurations.each { |c| .supported_devices = :iphone_only}
 
     # Uncomment this to include additional files
     #
@@ -38,13 +38,13 @@ application_for :ios, 8.0 do |target|
 
     # Uncomment to set your own build settings
     #
-    #target.all_configurations.settings["ENABLE_BITCODE"] = "NO"
-    #target.all_configurations.settings["GCC_PREFIX_HEADER"] = "APP-Prefix-Header.pch"
-    #target.all_configurations.settings["SWIFT_OBJC_BRIDGING_HEADER"] = "APP-Bridging-Header.h"
+    #target.all_configurations.each { |c| c.settings["ENABLE_BITCODE"] = "NO"}
+    #target.all_configurations.each { |c| c.settings["GCC_PREFIX_HEADER"] = "APP-Prefix-Header.pch"}
+    #target.all_configurations.each { |c| c.settings["SWIFT_OBJC_BRIDGING_HEADER"] = "APP-Bridging-Header.h"}
 
     # Uncomment to define your own preprocessor macros
     #
-    #target.all_configurations.preprocessor_definitions["API_ENDPOINT"] = "https://example.org".to_obj_c
+    #target.all_configurations.each { |c| c.preprocessor_definitions["API_ENDPOINT"] = "https://example.org".to_obj_c}
 
     # Comment to remove Unit Tests for your app
     #

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = "0.6.7".freeze
+  VERSION = "0.6.8".freeze
 end

data/xcake.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.4.0"
   spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "rubocop", "~> 0.39.0"
   spec.add_development_dependency "yard", "~> 0.8"
   spec.add_development_dependency "pry", "~> 0.10"
   spec.add_dependency "claide", "~> 0.9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.39.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement