xcake 0.6.22 → 0.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12859d445783f2e2a40fea70164a1f630ce36533
-  data.tar.gz: 37d241806844ab53332346567127a596b5640f7e
+  metadata.gz: 4cd5d71c3ac6a1f9f2c04fd05d10c70c14194f98
+  data.tar.gz: 1955097615457d19444a8d39c2012f69e8401875
 SHA512:
-  metadata.gz: b2518df409472db361955d32a12f339e00fdc1b4c5ce00683fcb2f0cb5bcdf93030c910ce0513f642c298ba9dfaf7bf778d584ac66b651010e4f332fa2772bf4
-  data.tar.gz: 1dc004d966679cb4105dbe8294ad76c7eaa4cb003142701626984c38b61cfad12817594c3a9ec535381b6ec9599bf601877232c6416b3c8a76b01246cfa3cc93
+  metadata.gz: a562a1e293bebe3b982ed04203de827bf998d937d1d8d9762e88c0d93c90981cafafb875e8979956f5e639020d27bb6f89d69ac75a98f2f0d203866419da3d78
+  data.tar.gz: f05d12ca029db9a1911bc5dbcac92ec1b464e7e658554b65b27169a54075d15ac8c6b66625064cc231705b5035aaaeaef92f87e0fa8e5cb1f48a9581ac4b7211

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.6.23
+=======
+- Adds support for Localized Files.
+- Swift is no-longer optimized for debug configurations when Xcake is ran with
+older versions of Xcodeproj.
+
 v0.6.22
 =======
 - Fixes crash with `after_save` hook.

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    xcake (0.6.20)
+    xcake (0.6.23)
+      activesupport (< 5)
       claide (>= 0.9.1, < 2.0)
       cork
       hooks (~> 0.4.1)
@@ -16,15 +17,15 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.2.0)
+    ast (2.3.0)
     claide (1.0.0)
     coderay (1.1.1)
     colored (1.2)
     cork (0.1.0)
       colored (~> 1.2)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    coveralls (0.8.14)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
@@ -36,7 +37,7 @@ GEM
     json (1.8.3)
     method_source (0.8.2)
     minitest (5.9.0)
-    parser (2.3.1.0)
+    parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.3)
@@ -58,8 +59,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.40.0)
-      parser (>= 2.3.1.0, < 3.0)
+    rubocop (0.41.1)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -67,9 +68,9 @@ GEM
     rubocop-git (0.1.1)
       rubocop (>= 0.24.1)
     ruby-progressbar (1.8.1)
-    simplecov (0.11.2)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
@@ -81,12 +82,12 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uber (0.0.15)
-    unicode-display_width (1.0.5)
-    xcodeproj (1.0.0)
+    unicode-display_width (1.1.0)
+    xcodeproj (1.1.0)
       activesupport (>= 3)
       claide (>= 1.0.0, < 2.0)
       colored (~> 1.2)
-    yard (0.8.7.6)
+    yard (0.9.0)
 
 PLATFORMS
   ruby
@@ -102,4 +103,4 @@ DEPENDENCIES
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/docs/Xcode Project Support.md

@@ -41,3 +41,8 @@ This document describes the level of support Xcake has for the various aspects o
 
 - No manual control. For Application targets, xcake creates them based on the configurations for those targets (i.e "myApp-Debug". "myApp-Release")
 - Xcode auto-creates them currently for other target types.
+
+## Files
+
+- Can Include Normal Files
+- Can Include Localized Files

data/lib/xcake/file_reference_installer.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Xcake
   # This generator handles adding nodes
   # to the project and creating a build phase
@@ -45,10 +47,34 @@ module Xcake
     # @!group Visitable
 
     def visit_node(node)
-      native_group = @context.native_object_for(node)
 
-      file_reference = native_group[node.component] ||
-                       native_group.new_reference(node.component)
+      # Tweak this to respect localizable files
+      #
+      # If ".lproj" is in file path
+      # - Create variant group from File Component
+      # - Files added to this group should have their path to be relative from
+      # the first non-variatn group
+      #
+      # Otherwise normal behaviour
+      native_group = @context.native_object_for(node.parent)
+
+      # Make sure this is the correct parent in variant groups
+      #
+      # TODO: Remove this duplication of the .lproj and node path code.
+      # Also remove need for the name hack.
+      if node.parent.component.include?(".lproj")
+        native_group.name = node.component
+        group_path = Pathname.new node.parent.parent.path
+      else
+        group_path = Pathname.new node.parent.path
+      end
+
+      file_path = Pathname.new node.path
+
+      node_location = file_path.relative_path_from group_path
+      file_reference = native_group.new_reference(node_location)
+
+      ######
 
       node.targets.each do |t|
         add_file_reference_to_target(file_reference, t)

data/lib/xcake/project.rb

@@ -95,7 +95,7 @@ module Xcake
 
     def default_settings
       common_settings = Xcodeproj::Constants::PROJECT_DEFAULT_BUILD_SETTINGS
-      settings = Xcodeproj::Project::ProjectHelper.deep_dup(common_settings[:all])
+      Xcodeproj::Project::ProjectHelper.deep_dup(common_settings[:all])
     end
 
     def default_debug_settings

data/lib/xcake/target.rb

@@ -233,6 +233,8 @@ module Xcake
 
     # TODO: Move this to a constant, maybe Xcodeproj ones should be brought
     # into here?
+    #
+    # Perhaps these could be made into a Gem itself?
     def default_settings
       {
         'INFOPLIST_FILE' => "#{name}/Supporting Files/Info.plist"
@@ -245,7 +247,11 @@ module Xcake
                                platform,
                                deployment_target.to_s,
                                type,
-                               language).merge!(default_settings)
+                               language)
+        .merge!(default_settings)
+        .merge({
+          'SWIFT_OPTIMIZATION_LEVEL' => '-Onone'
+          })
     end
 
     def default_release_settings

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = '0.6.22'.freeze
+  VERSION = '0.6.23'.freeze
 end

data/lib/xcake/xcode/project.rb

@@ -125,12 +125,27 @@ module Xcake
       # TODO: Simplify this method figure out more reliable rules for group
       # generation - maybe part of the new file installer in 0.7.
       #
+      # As well as variant groups and other types of groups.
+      #
       def new_group(node)
-        return main_group unless node.parent
 
-        group = main_group unless node.parent
-        group = main_group.find_subpath(node.parent.path, true) unless group
-        ensure_parent_path(group, node.parent)
+        return main_group unless node
+
+        if node.component.include?(".lproj")
+
+          group = main_group.find_subpath(node.parent.path, true) unless group
+
+          variant_group = group.project.new(PBXVariantGroup)
+          variant_group.set_source_tree(:group)
+          group.children << variant_group
+
+          group = variant_group
+        else
+          group = main_group.find_subpath(node.path, true) unless group
+        end
+
+        #TODO: Does this work with this new system
+        ensure_parent_path(group, node)
 
         group
       end

data/xcake.gemspec

@@ -32,4 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hooks', '~> 0.4.1'
   spec.add_dependency 'xcodeproj', '< 2.0.0', '>= 0.20'
   spec.add_dependency 'cork'
+
+  # Lock `activesupport` (transitive depedency via `xcodeproj`) to keep supporting system ruby
+  spec.add_dependency 'activesupport', '< 5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.6.22
+  version: 0.6.23
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,6 +176,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: Create your Xcode projects automatically using a stupid simple DSL.
 email:
 - james@supmenow.com