xcake 0.6.19 → 0.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a20b9a1ed07a07a5d8f0120654dbd3fb3039ea
-  data.tar.gz: f605d186b78d8e598b2a91cf254a007610daf672
+  metadata.gz: 10ab3f2002a23f912cbc8a2eac97c2810d0eedec
+  data.tar.gz: 32df4ea91d423def8d317897ba5dbcd9e666a4e7
 SHA512:
-  metadata.gz: 9a9ac89d9458724f4765bac32db2150e19f35c90a1e36e0908d82306e93e6fded9e8f39324eaaa43bfef53e173fe6afdf88ba2ff3d2ab0cfac6fb2bb56b781d0
-  data.tar.gz: 518834da68df9c79b9a2633bbaa8af13b1bdbbabbc273192a6ccc9fbe93c102ac86bc8e2f2f50456925bce8c7becab392ade7f9babb11d3eb1889a80ee687b8f
+  metadata.gz: ff9b96ac30820b273bc8c2ee45c8f7c17d17d976eacfe36b8c54c0b31dc8ebb64d30f67a2a55244479bc3ef5bc8514f7eac3cc70c50e1e54af734b0dbbc5bd4f
+  data.tar.gz: f6bb209ab0f2e521ad862648c9dbca5e4a0d3bbe923648d78939e4195d4055d71105cbbb153515cf59ff09c817c08ad933a42ed7090a735f4e8e4250bc6c6e79

data/.travis.yml

@@ -6,4 +6,3 @@ rvm:
   - 2.1.6
   - 2.2.2
 before_install: gem install bundler -v 1.10.6
-cache: bundler

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+v0.6.20
+=======
+- When adding a file to a group, Xcode will now open the correct folder.
+- Adds support for adding third-party frameworks.
+- Fixes `all_configurations` not returning all configurations when using implicit configurations.
+- Names of the implicit configurations match the default configurations for Xcode projects.
+- Fixes out of date documentation.
+- Fixes typos and out of date API used in `xcake init` template.
+- Removes dependency on `Molinillo` for internal dependency resolution.
+- Fixes issues with adding XCConfig.
+
 v0.6.19
 =======
 - Uses the reccomended code signing settings from Apple.
@@ -31,7 +42,7 @@ v0.6.13
 
 v0.6.12
 =======
-- Fixes issues when resolving project if sensible default configurations.
+- Fixes issues when resolving project with implicit configurations.
 
 v0.6.11
 =======

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    xcake (0.6.19)
+    xcake (0.6.20)
       claide (>= 0.9.1, < 2.0)
+      colored
       hooks (~> 0.4.1)
-      molinillo
-      tty (~> 0.3.2)
       xcodeproj (>= 0.20, < 2.0.0)
 
 GEM
@@ -29,20 +28,14 @@ GEM
       tins (~> 1.6.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    equatable (0.5.0)
     hooks (0.4.1)
       uber (~> 0.0.14)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
     minitest (5.9.0)
-    molinillo (0.4.5)
-    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)
@@ -63,12 +56,14 @@ 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)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-git (0.1.1)
+      rubocop (>= 0.24.1)
     ruby-progressbar (1.8.1)
     simplecov (0.11.2)
       docile (~> 1.1.0)
@@ -81,47 +76,10 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tins (1.6.0)
-    tty (0.3.2)
-      equatable (~> 0.5.0)
-      pastel (~> 0.5.1)
-      tty-cursor (~> 0.1.0)
-      tty-pager (~> 0.3.0)
-      tty-platform (~> 0.1.0)
-      tty-progressbar (~> 0.7.0)
-      tty-prompt (~> 0.2.0)
-      tty-screen (~> 0.4.0)
-      tty-spinner (~> 0.1.0)
-      tty-table (~> 0.4.0)
-      tty-which (~> 0.1.0)
-    tty-cursor (0.1.0)
-    tty-pager (0.3.0)
-      tty-screen (~> 0.4.0)
-      tty-which (~> 0.1.0)
-      verse (~> 0.4.0)
-    tty-platform (0.1.0)
-    tty-progressbar (0.7.0)
-      tty-screen (~> 0.4.0)
-    tty-prompt (0.2.0)
-      necromancer (~> 0.3.0)
-      pastel (~> 0.5.1)
-      tty-platform (~> 0.1.0)
-    tty-screen (0.4.3)
-    tty-spinner (0.1.0)
-    tty-table (0.4.0)
-      equatable (~> 0.5.0)
-      necromancer (~> 0.3.0)
-      pastel (~> 0.5.1)
-      tty-screen (~> 0.4.0)
-      unicode_utils (~> 1.4.0)
-      verse (~> 0.4.0)
-    tty-which (0.1.0)
     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)
     xcodeproj (1.0.0)
       activesupport (>= 3)
       claide (>= 1.0.0, < 2.0)
@@ -137,9 +95,9 @@ DEPENDENCIES
   pry (~> 0.10)
   rake (~> 10.0)
   rspec (~> 3.4.0)
-  rubocop (~> 0.39.0)
+  rubocop-git (~> 0.1.1)
   xcake!
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.12.1
+   1.11.2

data/README.md

@@ -4,7 +4,7 @@
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/fastlane/blob/master/LICENSE)
 [![Build Status](https://img.shields.io/travis/jcampbell05/xcake/master.svg?style=flat)](https://travis-ci.org/jcampbell05/xcake)
 [![Test Coverage](https://img.shields.io/coveralls/jcampbell05/xcake/master.svg)](https://coveralls.io/github/jcampbell05/xcake)
-[![Gem](https://raw.githubusercontent.com/fastlane/fastlane/master/fastlane/lib/fastlane/plugins/templates/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-xcake)
+[![Gem](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-xcake)
 
 ###Xcode projects made a piece of cake.
 

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/_rubocop.yml

@@ -4,7 +4,7 @@
 
 inherit_from: .rubocop_general.yml
 
-# e.g. 
+# e.g.
 # def self.is_supported?(platform)
 # we may never use `platform`
 Lint/UnusedMethodArgument:

data/bin/console

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
+require 'bundler/setup'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
+require 'pry'
 Pry.start

data/bin/xcake

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "xcake"
+require 'xcake'
 
 Xcake::Command.run(ARGV)

data/docs/Cakefile.md

@@ -51,7 +51,7 @@ project.project_name = "Project"
 Sets the filename for the project
 
 ```ruby
-project.project_name = "Project"
+project.name = "Project"
 ```
 
 #### Class Prefix
@@ -98,7 +98,7 @@ We can also specify a testing targets for other targets as well:
 
 ```ruby
 application_for :mac, 8.0 do |target|
-  unit_tests_for target 
+  unit_tests_for target
 end
 ```
 
@@ -110,14 +110,14 @@ If you want to manually control configuration of unit tests targets (and/or have
 application_for :mac, 8.0 do |target|
 
   unit_tests_for target do |test_target|
-  
+
         test_target.name = "MyAwesomeTests"
         test_target.include_files = ["Tests/**/*.*"]
-        
+
         # configure any other target-related properties
         # as you would do with normal target
 
-    end 
+    end
 end
 ```
 
@@ -258,6 +258,8 @@ end
 We can apply a particular shared setting across all of our configurations.
 Xcake provides a simply way of doing this via an "all" configuration.
 
+This will return an array of all of the currently declared configurations.
+
 ```ruby
 all_configurations.each { |c| c.supported_devices = :iphone_only }
 ```
@@ -289,9 +291,6 @@ it also has its own hiearchy of settings, which are in the following order
 - Default Settings
   These are the sensible defaults xcake provides for the configuration.
 
-- All Settings
-  These are any settings set via the "All" configuration
-
 - Custom Settings
   These are the settings set directly on the configuration.
 
@@ -305,15 +304,23 @@ Sets the name of the configuration
 configuration.name = "Release"
 ```
 
+#### Configuration File
+
+Sets the path to a XCConfig file to inherit build settings from.
+
+```ruby
+configuration.configuration_file = "Files/Settings.xcconfig"
+```
+
 #### Build Settings
 
 A hash of all the build settings for a configuration
 
 ```ruby
-configuration.build_settings["ENABLE_BITCODE"] = false
+configuration.settings["ENABLE_BITCODE"] = false
 ```
 
-###Build Settings Shortcuts
+### Build Settings Shortcuts
 
 Xcake also provides some shortcuts for some more common build settings.
 

data/docs/Xcode Project Support.md

@@ -35,6 +35,7 @@ This document describes the level of support Xcake has for the various aspects o
 - Specify build settings
 - Used to create build configuration for project and targets.
 - Used to create schemes for applications
+- Set XCConfig to inherit settings from.
 
 ## Scheme
 

data/fastlane-plugin-xcake/README.md

@@ -1,6 +1,6 @@
 # xcake `fastlane` Plugin
 
-[![Gem](https://raw.githubusercontent.com/fastlane/fastlane/master/fastlane/lib/fastlane/plugins/templates/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-xcake)
+[![Gem](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-xcake)
 
 ## Getting Started
 

data/fastlane-plugin-xcake/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/fastlane-plugin-xcake/fastlane-plugin-xcake.gemspec

@@ -6,12 +6,12 @@ require 'fastlane/plugin/xcake/version'
 Gem::Specification.new do |spec|
   spec.name          = 'fastlane-plugin-xcake'
   spec.version       = Fastlane::Xcake::VERSION
-  spec.authors       = ["James Campbell"]
-  spec.email         = ["james@supmenow.com"]
+  spec.authors       = ['James Campbell']
+  spec.email         = ['james@supmenow.com']
 
-  spec.summary       = %q{DSL for Xcode Projects.}
-  spec.description   = %q{Create your Xcode projects automatically using a stupid simple DSL.}
-  spec.homepage      = "https://github.com/jcampbell05/xcake/"
+  spec.summary       = 'DSL for Xcode Projects.'
+  spec.description   = 'Create your Xcode projects automatically using a stupid simple DSL.'
+  spec.homepage      = 'https://github.com/jcampbell05/xcake/'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/fastlane-plugin-xcake/lib/fastlane/plugin/xcake/actions/xcake_action.rb

@@ -1,7 +1,7 @@
 module Fastlane
   module Actions
     class XcakeAction < Action
-      def self.run(params)
+      def self.run(_params)
         require 'xcake'
 
         if defined?(::Xcake::Command::Make)
@@ -14,7 +14,7 @@ module Fastlane
       end
 
       def self.description
-        "Runs `xcake` for the project"
+        'Runs `xcake` for the project'
       end
 
       def self.available_options
@@ -27,7 +27,7 @@ module Fastlane
       end
 
       def self.authors
-        ["jcampbell05"]
+        ['jcampbell05']
       end
     end
   end

data/lib/xcake/command/init.rb

@@ -1,15 +1,15 @@
 module Xcake
   class Command
     class Init < Command
-      self.summary = "Initilises an example Cakefile for creating a project"
-      self.description = "Initilises an example Cakefile for creating a project"
+      self.summary = 'Initilises an example Cakefile for creating a project'
+      self.description = 'Initilises an example Cakefile for creating a project'
 
       def run
         cakefile_path = "#{File.dirname(__FILE__)}/../resources/Cakefile"
         cakefile_contents = File.read(cakefile_path)
-        File.write("Cakefile", cakefile_contents)
+        File.write('Cakefile', cakefile_contents)
 
-        puts "Open Cakefile to edit and run xcake make to get your xcode project"
+        puts 'Open Cakefile to edit and run xcake make to get your xcode project'
       end
     end
   end

data/lib/xcake/command/make.rb

@@ -1,11 +1,8 @@
-require 'molinillo'
-
-#TODO: Reduce lines of code here :)
 module Xcake
   class Command
     class Make < Command
-      self.summary = "Makes the Xcode project from a Cakefile"
-      self.description = "Makes the Xcode project from a Cakefile"
+      self.summary = 'Makes the Xcode project from a Cakefile'
+      self.description = 'Makes the Xcode project from a Cakefile'
 
       def run
         file_path = "#{Dir.pwd}/Cakefile"
@@ -14,25 +11,17 @@ module Xcake
           raise Xcake::Informative, "Couldn't find Cakefile"
         end
 
-        puts "Reading Cakefile..."
+        puts 'Reading Cakefile...'
         file_contents = File.read(file_path)
 
         project = Project.new
-        project.instance_eval(file_contents)
+        project.instance_eval(file_contents, file_path)
 
         context = XcodeprojContext.new
 
-        #TODO: Debug logs for generator
-        repository = Generator.repository
-        #puts "Registered Generators #{repository}"
-
-        #TODO: Don't use class as name
-        dependency_provider = DependencyProvider.new(repository)
-        resolver = Molinillo::Resolver.new(dependency_provider, UI.new)
-        resolution = resolver.resolve(Generator.repository)
-        resolution.tsort.map do |g|
-          #puts "Running #{g.name}..."
-          generator = g.name.new(context)
+        dependency_provider = DependencyProvider.new(Generator)
+        dependency_provider.tsort.each do |g|
+          generator = g.new(context)
           project.accept(generator)
         end
       end

data/lib/xcake/command.rb

@@ -1,15 +1,14 @@
-require "claide"
+require 'claide'
 
 module Xcake
   class Command < CLAide::Command
-
-    require "xcake/command/init"
-    require "xcake/command/make"
+    require 'xcake/command/init'
+    require 'xcake/command/make'
 
     self.abstract_command = true
-    self.command = "xcake"
+    self.command = 'xcake'
     self.version = VERSION
-    self.description = "Create and maintain Xcode project files easily."
+    self.description = 'Create and maintain Xcode project files easily.'
     self.plugin_prefixes = %w(claide xcake)
   end
 end

data/lib/xcake/configurable.rb

@@ -12,7 +12,6 @@ module Xcake
   #   end
   #
   module Configurable
-
     private
 
     attr_accessor :configurations
@@ -25,14 +24,28 @@ module Xcake
       if @configurations.nil?
         @configurations = []
 
-        parent_configurable.all_configurations.each do |c|
-          configuration(c.name, c.type)
-        end if parent_configurable
+        if parent_configurable && parent_configurable.all_configurations
+          copy_parent_configurations
+        else
+          debug_configuration :Debug
+          release_configuration :Release
+        end
+
       end
 
       @configurations
     end
 
+    private
+
+    def copy_parent_configurations
+      parent_configurable.all_configurations.each do |c|
+        configuration(c.name, c.type)
+      end if parent_configurable
+    end
+
+    public
+
     # @param [Array<Configuration>] new list of configurations to set
     #
     def all_configurations=(configurations)
@@ -42,7 +55,9 @@ module Xcake
     # @return [Array<Configuration>] list of configurations of a type
     #
     def configurations_of_type(type)
-      all_configurations.select do |c|
+      return [] if @configurations.nil?
+
+      @configurations.select do |c|
         c.type == type
       end
     end
@@ -76,8 +91,7 @@ module Xcake
     #
     # @return [Configuration] the new or existing configuration
     #
-    def configuration(name, type, &block)
-
+    def configuration(name, type)
       default_settings = default_settings_for_type(type)
       configurations = configurations_of_type(type)
 
@@ -94,14 +108,14 @@ module Xcake
         name = type.to_s.capitalize if name.nil?
 
         build_configuration = Configuration.new(name) do |b|
-
           b.type = type
           b.settings.merge!(default_settings)
 
-          block.call(b) if block_given?
+          yield(b) if block_given?
         end
 
-        all_configurations << build_configuration
+        @configurations ||= []
+        @configurations << build_configuration
       end
 
       build_configuration

data/lib/xcake/configuration/proxies/preproccessor_definitions_setting_proxy.rb

@@ -29,7 +29,7 @@ module Xcake
       def initialize(settings, key)
         @settings = settings
         @key = key
-        @settings[@key] ||= ["$(inherited)"]
+        @settings[@key] ||= ['$(inherited)']
       end
 
       # The subscript operator is used to define the preprocessor defination

data/lib/xcake/configuration/sugar.rb

@@ -4,10 +4,10 @@ module Xcake
     #                                supported_devices setting
     #
     SUPPORTED_DEVICES = {
-      iphone_only: "1",
-      ipad_only: "2",
-      universal: "1,2"
-    }
+      iphone_only: '1',
+      ipad_only: '2',
+      universal: '1,2'
+    }.freeze
 
     # Convienence method to easily set the
     # supported devices for a application.
@@ -25,14 +25,14 @@ module Xcake
     #
     def supported_devices=(devices)
       supported_devices = SUPPORTED_DEVICES[devices]
-      settings["TARGETED_DEVICE_FAMILY"] = supported_devices
+      settings['TARGETED_DEVICE_FAMILY'] = supported_devices
     end
 
     # Convienience method to easily set the
     # product's bundle identifier
     #
     def product_bundle_identifier=(identifier)
-      settings["PRODUCT_BUNDLE_IDENTIFIER"] = identifier
+      settings['PRODUCT_BUNDLE_IDENTIFIER'] = identifier
     end
 
     # Convienence method to easily set preprocessor directives
@@ -40,7 +40,7 @@ module Xcake
     def preprocessor_definitions
       PreprocessorDefinitionsSettingProxy.new(
         settings,
-        "GCC_PREPROCESSOR_DEFINITIONS"
+        'GCC_PREPROCESSOR_DEFINITIONS'
       )
     end
   end

data/lib/xcake/configuration.rb

@@ -11,7 +11,6 @@ module Xcake
   # target.
   #
   class Configuration
-
     include Visitable
 
     # @return [String] the name of the configuration
@@ -30,7 +29,7 @@ module Xcake
     #
     attr_accessor :settings
 
-    # @return [String] the name of the xcconfig file to use for
+    # @return [String] the path of the xcconfig file to use for
     #         the build configuration.
     #
     #         This is resolved to a PBXFileReference.
@@ -51,11 +50,11 @@ module Xcake
     #             c.settings["INFO_PLIST"] = "./myapp/info.plist"
     #           end
     #
-    def initialize(name, &block)
+    def initialize(name)
       self.name = name.to_s
       self.settings = {}
 
-      block.call(self) if block_given?
+      yield(self) if block_given?
     end
   end
 end

data/lib/xcake/context/xcodeproj_context.rb

@@ -1,8 +1,7 @@
-require "xcodeproj"
+require 'xcodeproj'
 
 module Xcake
   class XcodeprojContext
-
     include Context
 
     attr_accessor :project
@@ -18,12 +17,12 @@ module Xcake
       when Node
         create_object_for_node(dsl_object)
       else
-        abort "DSL Object not recognized!"
+        abort 'DSL Object not recognized!'
       end
     end
 
     def create_object_for_project(project)
-      puts "Creating Project..."
+      puts 'Creating Project...'
 
       # TODO: Make setup of project testable
       @project = Xcode::Project.new("./#{project.name}.xcodeproj", true)
@@ -32,18 +31,22 @@ module Xcake
     end
 
     def create_object_for_target(target)
-      puts "Creating Target..."
+      puts 'Creating Target...'
       @project.new_target(target)
     end
 
     def create_object_for_configuration(configuration)
-      puts "Creating Configuration..."
+      puts 'Creating Configuration...'
       @project.new_configuration(configuration)
     end
 
     def create_object_for_node(node)
-      puts "Creating Group..."
+      puts 'Creating Group...'
       @project.new_group(node)
     end
+
+    def file_reference_for_path(path)
+      @project.reference_for_path(path) || @project.new_file_reference(path)
+    end
   end
 end

data/lib/xcake/context.rb

@@ -11,5 +11,8 @@ module Xcake
     def native_object_for(dsl_object)
       object_hash[dsl_object] ||= create_object_for(dsl_object)
     end
+
+    def file_reference_for_path(path)
+    end
   end
 end