xcake 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de769913fe7e8933b0d4430da16bc9f941c698d0
-  data.tar.gz: fff72d3a6e395c2513d5d02736bcb84ac8e56663
+  metadata.gz: f0ff187c7c8abcfc66e786e8125838dea09a7988
+  data.tar.gz: 98741d58c0d01f646dde5fc098aa230462278c9e
 SHA512:
-  metadata.gz: 6a24030e839b19208cdb0bf0e059ffaaafe45e0c90dbc161069d6fbf0d68d18af6ec4b30856531ce6490fcd4a9d48adc405ca1503776c3fe74b4cbd0aa10b543
-  data.tar.gz: 8fc9ee38da47dffb1f92d1471195f47ae0d48911bc6b528d536f9d049c45f4400d92678f94c712f03193785d9bdef1ed76c90f3a2b0fd7374b8bc38c318cc9f0
+  metadata.gz: d37659e6c2ff7d9068072ab13cd623a32a4fe4e0302dd1497f7c91ffd0635986f83ff456593b264a52feb24bd70a56d7ed047e45b153908ea59637ee55fd0ad2
+  data.tar.gz: c208c53456927326326dc25c9f5adcc37c8868ed56724276f19a52ce001174b7c5beed056c73240e0ed9396decb5f8efadff7e26ba3e36fb4097f9283be446b6

data/.travis.yml

@@ -2,5 +2,8 @@ os:
   - osx
 language: ruby
 rvm:
-  - 2.2.1
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2
 before_install: gem install bundler -v 1.10.6
+cache: bundler

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.3.1
+======
+- Adds Hook system, starting with "after_save" hook for when project is saved.
+- Adds ability to specify array of files to include or exclude.
+
 v0.3.0
 ======
 - Simplified Watch OS target syntax.

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    xcake (0.3.1)
+    xcake (0.4.1)
       claide (~> 0.9.1)
       hooks (~> 0.4.1)
+      tty (~> 0.3.2)
       xcodeproj (~> 0.28)
 
 GEM
@@ -16,6 +17,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     claide (0.9.1)
+    coderay (1.1.0)
     colored (1.2)
     coveralls (0.8.10)
       json (~> 1.8)
@@ -28,15 +30,25 @@ GEM
     docile (1.1.5)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
+    equatable (0.5.0)
     hooks (0.4.1)
       uber (~> 0.0.14)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
+    method_source (0.8.2)
     mime-types (2.99)
     minitest (5.8.3)
+    necromancer (0.3.0)
     netrc (0.11.0)
+    pastel (0.5.2)
+      equatable (~> 0.5)
+      tty-screen (~> 0.4)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (10.4.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -60,17 +72,55 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     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)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
+    unicode_utils (1.4.0)
+    verse (0.4.0)
+      unicode_utils (~> 1.4.0)
     xcodeproj (0.28.2)
       activesupport (>= 3)
       claide (~> 0.9.1)
@@ -83,6 +133,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.10)
   coveralls (~> 0.8)
+  pry (~> 0.10)
   rake (~> 10.0)
   rspec (~> 3.4.0)
   xcake!

data/bin/console

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require
-
 
 # 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.

data/docs/Cakefile.md

@@ -260,3 +260,19 @@ Allows you specify the devices an iOS App can run on, can be `:iphone_only`,
 ```ruby
 configuration.supported_devices = :iphone_only
 ```
+
+#### Product Bundle Identifier
+
+Allows you specify the product bundle identifier.
+
+```ruby
+configuration.product_bundle_identifier = "com.test.app"
+```
+
+#### Preprocessor Definitions
+
+Allows you to specify preprocessor definitions.
+
+```ruby
+configuration.preprocessor_definitions["NAME"] = "VALUE"
+```

data/docs/Getting Started.md

@@ -1,4 +1,4 @@
-# Getting Started
+#Getting Started
 
 Xcake allows you to describe a Xcode project via an easy to use DSL, We do this
 by creating a simple text file, our `Cakefile`. This tutorial will show you how

data/docs/Xcode Project Support.md

@@ -0,0 +1,42 @@
+#Xcode Project  Support
+
+This document describes the level of support Xcake has for the various aspects of the Xcode Project.
+
+## Project
+
+- Create a Project File
+- Create build configurations via configurations
+- Set name of project file
+- Setting Class Prefix
+- Setting Organization
+- Including Files and Groups (Currently done via Targets)
+- Including Frameworks (Currently done via Targets)
+- Specify build settings via configurations
+- Specify schemes (Currently only for applications via configurations - Xcode auto-creates for other types)
+
+## Target
+
+- Create target
+- Create build configurations via configurations
+- Set name of target
+- Set primary language
+- Set platform
+- Set deployment target
+- Specify device (Universal, iPad Only or iPhone Only)
+- Specifying Files and Assets to include for Target
+- Specifying Frameworks to include for Target
+- Specify build settings via configurations
+- Simple methods for creating iOS, Mac and WatchOS Applications.
+- Simple methods for creating Unit Tests
+
+## Configuration
+
+- Set name for configuration (Used for name of build configuration created)
+- Specify build settings
+- Used to create build configuration for project and targets.
+- Used to create schemes for applications
+
+## Scheme
+
+- 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.

data/lib/xcake.rb

@@ -1,10 +1,15 @@
+
+require "xcake/core_ext/string"
+
 require "xcake/visitable"
 require "xcake/visitor"
 require "xcake/version"
 
+require "xcake/informative"
 require "xcake/command"
 require "xcake/configuration"
 require "xcake/configuration/sugar"
+require "xcake/configuration/proxies/preproccessor_definitions_setting_proxy"
 require "xcake/configurable"
 
 require "xcake/generator/build_phase"

data/lib/xcake/command.rb

@@ -1,16 +1,21 @@
-require 'claide'
+require "claide"
 
 module Xcake
   class Command < CLAide::Command
 
-    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."
 
     def run
+      file_path = "#{Dir.pwd}/Cakefile"
+
+      unless File.exist?(file_path)
+        raise Xcake::Informative, "Couldn't find Cakefile"
+      end
 
       puts "Reading Cakefile..."
-      file_contents = File.read("#{Dir.pwd}/Cakefile")
+      file_contents = File.read(file_path)
       cakefile = eval(file_contents)
 
       resolver = ProjectStructureResolver.new

data/lib/xcake/configurable.rb

@@ -87,20 +87,7 @@ module Xcake
     # @return [Configuration] the new or existing debug configuration
     #
     def debug_configuration(name, &block)
-
-      configuration = debug_configurations.find do |c|
-        c.name == name.to_s
-      end
-
-      if configuration == nil
-        configuration = Configuration.new(name) do |b|
-          block.call(b) if block_given?
-        end
-
-        debug_configurations << configuration
-      end
-
-      configuration
+      build_configuration(:debug, name, &block)
     end
 
     # This either finds a release configuration
@@ -109,17 +96,23 @@ module Xcake
     # @return [Configuration] the new or existing release configuration
     #
     def release_configuration(name, &block)
+      build_configuration(:release, name, &block)
+    end
+
+    private
 
-      configuration = release_configurations.find do |c|
+    def build_configuration(method, name, &block)
+      configuration_name = send("#{method}_configurations")
+      configuration = configuration_name.detect do |c|
         c.name == name.to_s
       end
 
-      if configuration == nil
+      if configuration.nil?
         configuration = Configuration.new(name) do |b|
           block.call(b) if block_given?
         end
 
-        release_configurations << configuration
+        configuration_name << configuration
       end
 
       configuration

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

@@ -0,0 +1,48 @@
+module Xcake
+  class Configuration
+    # This class is a proxy to the Preprocessor build
+    # setting. It abstracts the setting of the value
+    # for this setting and makes it easier to define
+    # new preprocessor definitions.
+    #
+    class PreprocessorDefinitionsSettingProxy
+      # the settings for the configuration this
+      # proxy is for
+      #
+      # @return [Hash<String, Object>] the settings for the
+      #                                proxied configuration
+      #
+      attr_accessor :settings
+
+      # @return [String] the key for the settings where the
+      #                  preprocessor definitions are kept
+      #
+      attr_accessor :key
+
+      # @param    [Hash<String, Object>] settings
+      #           the settings for the proxied configuration
+      #
+      # @param    [String] key
+      #           the key for the settings where the preprocessor
+      #           definitions are kept
+      #
+      def initialize(settings, key)
+        @settings = settings
+        @key = key
+        @settings[@key] ||= ["$(inherited)"]
+      end
+
+      # The subscript operator is used to define the preprocessor defination
+      #
+      # @param    [String] key
+      #           the key for the preprocessor definition
+      #
+      # @param    [Object] value
+      #           the value for the preprocessor definition
+      #
+      def []=(key, value)
+        @settings[@key] << "#{key}=#{value}"
+      end
+    end
+  end
+end

data/lib/xcake/configuration/sugar.rb

@@ -25,5 +25,22 @@ module Xcake
       supported_devices = SUPPORTED_DEVICES[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
+    end
+
+    # Convienence method to easily set the
+    # product's bundle identifier
+    #
+    def preprocessor_definitions
+      PreprocessorDefinitionsSettingProxy.new(
+        settings,
+        "GCC_PREPROCESSOR_DEFINITIONS"
+      )
+    end
   end
 end

data/lib/xcake/core_ext/string.rb

@@ -0,0 +1,13 @@
+class String
+  # Escapes string for use with Objective-C
+  #
+  def to_obj_c
+    "\\\@\\\"#{self}\\\""
+  end
+
+  # Escapes string for use with C
+  #
+  def to_c
+    "\\\"#{self}\\\""
+  end
+end

data/lib/xcake/generator/build_phase.rb

@@ -40,11 +40,9 @@ module Xcake
       # @return [PBXGroup] the group
       #
       def group_for_node(node)
-        if node.parent
-          @project.main_group.find_subpath(node.parent.path, true)
-        else
-          @project.main_group
-        end
+        return @project.main_group unless node.parent
+
+        @project.main_group.find_subpath(node.parent.path, true)
       end
 
       # Adds file reference to the target.
@@ -68,7 +66,6 @@ module Xcake
         file_reference = group.new_reference(node.path)
 
         node.targets.each do |t|
-           puts "Added to #{t}"
            add_file_reference_to_target(file_reference, t)
         end
       end

data/lib/xcake/generator/build_phase/compile_source_build_phase.rb

@@ -6,8 +6,8 @@ module Xcake
     class CompileSourceBuildPhase < BuildPhase
 
       def self.can_install_node(node)
-        File.directory?(node.path) == false &&
-        [".c", ".m", ".mm", ".cpp", ".swift"].include?(File.extname(node.path))
+        !File.directory?(node.path) &&
+          %w(.c .m .mm .cpp .swift).include?(File.extname(node.path))
       end
 
       def add_file_reference_to_target(file_reference, target)

data/lib/xcake/generator/build_phase/copy_resources_build_phase.rb

@@ -6,7 +6,7 @@ module Xcake
     class CopyResourcesBuildPhase < BuildPhase
 
       def self.can_install_node(node)
-        File.directory?(node.path) == false
+        !File.directory?(node.path)
       end
 
       def add_file_reference_to_target(file_reference, target)

data/lib/xcake/generator/build_phase/copy_xcassets_build_phase.rb

@@ -6,8 +6,8 @@ module Xcake
     class CopyXCAssetsBuildPhase < CopyResourcesBuildPhase
 
       def self.can_install_node(node)
-        File.directory?(node.path) == true &&
-        [".xcassets"].include?(File.extname(node.path)) == true
+        File.directory?(node.path) &&
+          [".xcassets"].include?(File.extname(node.path))
       end
 
       def visit_node(node)

data/lib/xcake/generator/build_phase/header_file_build_phase.rb

@@ -5,8 +5,8 @@ module Xcake
       # and ignores them.
       #
       def self.can_install_node(node)
-        File.directory?(node.path) == false &&
-        [".h", ".hpp"].include?(File.extname(node.path)) == true
+        !File.directory?(node.path) &&
+          [".h", ".hpp"].include?(File.extname(node.path))
       end
     end
   end

data/lib/xcake/generator/configuration.rb

@@ -9,11 +9,17 @@ module Xcake
 
       include Visitor
 
-#TODO: BDD these are stored
+      # @return [Project] project for the configuration
+      #
+      attr_accessor :project
+
+      # @return [Object] object from xcode project the configuration is for
+      #
+      attr_accessor :configuration_target
 
       # @param    [Project] project for the configuration
       #
-      # @param    [Object] object in the xcode project configuration is for
+      # @param    [Object] object from xcode project the configuration is for
       #
       def initialize(project, configuration_target)
         @project = project

data/lib/xcake/informative.rb

@@ -0,0 +1,15 @@
+require "claide"
+require "tty"
+
+# Indicates an user error.
+#
+module Xcake
+  class Informative < StandardError
+    include CLAide::InformativeError
+
+    def message
+      pastel = Pastel.new
+      pastel.red "[!] #{super}"
+    end
+  end
+end

data/lib/xcake/project.rb

@@ -71,6 +71,23 @@ module Xcake
       target
     end
 
+    # Visitable
+    def accept(visitor)
+      visitor.visit(self)
+
+      flatten_configurations.each do |c|
+        visitor.visit(c)
+        visitor.leave(c)
+      end
+
+      targets.each do |t|
+        visitor.visit(t)
+        visitor.leave(t)
+      end
+
+      visitor.leave(self)
+    end
+
     protected
 
     # Configurable
@@ -88,24 +105,5 @@ module Xcake
       common_settings = Xcodeproj::Constants::PROJECT_DEFAULT_BUILD_SETTINGS
       default_settings.merge!(Xcodeproj::Project::ProjectHelper.deep_dup(common_settings[:release]))
     end
-
-    public
-
-    # Visitable
-    def accept(visitor)
-      visitor.visit(self)
-
-      flatten_configurations.each do |c|
-        visitor.visit(c)
-        visitor.leave(c)
-      end
-
-      self.targets.each do |t|
-        visitor.visit(t)
-        visitor.leave(t)
-      end
-
-      visitor.leave(self)
-    end
   end
 end

data/lib/xcake/target.rb

@@ -192,11 +192,21 @@ module Xcake
     end
 
     def default_debug_settings
-      Xcodeproj::Project::ProjectHelper.common_build_settings(:debug, platform, deployment_target.to_s, type, language).merge!(default_settings)
+      Xcodeproj::Project::ProjectHelper.
+        common_build_settings(:debug,
+                              platform,
+                              deployment_target.to_s,
+                              type,
+                              language).merge!(default_settings)
     end
 
     def default_release_settings
-      Xcodeproj::Project::ProjectHelper.common_build_settings(:release, platform, deployment_target.to_s, type, language).merge!(default_settings)
+      Xcodeproj::Project::ProjectHelper.
+        common_build_settings(:release,
+                              platform,
+                              deployment_target.to_s,
+                              type,
+                              language).merge!(default_settings)
     end
 
     #Visitable

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

data/xcake.gemspec

@@ -10,15 +10,16 @@ Gem::Specification.new do |spec|
   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.description   = %q{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)/}) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.executables   =  %w{ xcake }
   spec.require_paths = ["lib"]
 
+
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_development_dependency "bundler", "~> 1.10"
@@ -26,7 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.4.0"
   spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "yard", "~> 0.8"
+  spec.add_development_dependency "pry", "~> 0.10"
   spec.add_dependency "claide", "~> 0.9.1"
   spec.add_dependency "hooks", "~> 0.4.1"
   spec.add_dependency "xcodeproj", "~> 0.28"
+  spec.add_dependency "tty", "~> 0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +136,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.28'
-description: |-
-  Create your Xcode projects automatically using a stupid simple
-    DSL.
+- !ruby/object:Gem::Dependency
+  name: tty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+description: Create your Xcode projects automatically using a stupid simple DSL.
 email:
 - james@supmenow.com
 executables:
@@ -139,7 +165,6 @@ files:
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Cakefile
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -155,12 +180,15 @@ files:
 - docs/Cakefile.md
 - docs/Getting Started.md
 - docs/Hooks.md
+- docs/Xcode Project Support.md
 - lib/fastlane_plugin.rb
 - lib/xcake.rb
 - lib/xcake/command.rb
 - lib/xcake/configurable.rb
 - lib/xcake/configuration.rb
+- lib/xcake/configuration/proxies/preproccessor_definitions_setting_proxy.rb
 - lib/xcake/configuration/sugar.rb
+- lib/xcake/core_ext/string.rb
 - lib/xcake/fastlane/xcake.rb
 - lib/xcake/generator/build_phase.rb
 - lib/xcake/generator/build_phase/compile_source_build_phase.rb
@@ -172,6 +200,7 @@ files:
 - lib/xcake/generator/path.rb
 - lib/xcake/generator/project.rb
 - lib/xcake/generator/target.rb
+- lib/xcake/informative.rb
 - lib/xcake/node.rb
 - lib/xcake/project.rb
 - lib/xcake/project/hooks.rb

data/Cakefile

@@ -1,10 +0,0 @@
-Project.new do |c|
-    c.application_for :ios, 8.0 do |t|
-      t.name = "test"
-
-      t.all_configurations.supported_devices = :iphone_only
-
-      c.unit_tests_for t
-      c.watch_app_for t, 2.0
-    end
-end