xcake 0.6.20 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ab3f2002a23f912cbc8a2eac97c2810d0eedec
-  data.tar.gz: 32df4ea91d423def8d317897ba5dbcd9e666a4e7
+  metadata.gz: 8dbc4303d0d40a50b5fb64dde657f5118705013c
+  data.tar.gz: 999ec99117f340038bb5ace7aecaa7d1747492ba
 SHA512:
-  metadata.gz: ff9b96ac30820b273bc8c2ee45c8f7c17d17d976eacfe36b8c54c0b31dc8ebb64d30f67a2a55244479bc3ef5bc8514f7eac3cc70c50e1e54af734b0dbbc5bd4f
-  data.tar.gz: f6bb209ab0f2e521ad862648c9dbca5e4a0d3bbe923648d78939e4195d4055d71105cbbb153515cf59ff09c817c08ad933a42ed7090a735f4e8e4250bc6c6e79
+  metadata.gz: 54d2a101fde7dc2cbc54e2ee01ddad4b814cb5e7b28296890e7494f9e46599026cfa7c6948e564851d4bace8fb3799737e9cf7538e06e4b774f1f2d215f9f13e
+  data.tar.gz: 5ef0d8678dfd585751dc08eef341a853673c1a419707f2acce616033563c19888f8bd0cf31cb7318cd035e42169acf6dea31007d5f368499c9dc1e273a14732d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.6.21
+=======
+- Improved UI Output.
+- Fixes crash when no XCConfig is set.
+
 v0.6.20
 =======
 - When adding a file to a group, Xcode will now open the correct folder.

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     xcake (0.6.20)
       claide (>= 0.9.1, < 2.0)
-      colored
+      cork
       hooks (~> 0.4.1)
       xcodeproj (>= 0.20, < 2.0.0)
 
@@ -20,6 +20,8 @@ GEM
     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)

data/bin/xcake

@@ -2,4 +2,6 @@
 
 require 'xcake'
 
+#TODO: Make UI and EventHooks DI-able
+Xcake::UI.register_ui_hooks
 Xcake::Command.run(ARGV)

data/lib/xcake/command/init.rb

@@ -9,7 +9,7 @@ module Xcake
         cakefile_contents = File.read(cakefile_path)
         File.write('Cakefile', cakefile_contents)
 
-        puts 'Open Cakefile to edit and run xcake make to get your xcode project'
+        EventHooks.run_hook(:after_cakefile_init)
       end
     end
   end

data/lib/xcake/command/make.rb

@@ -11,7 +11,7 @@ module Xcake
           raise Xcake::Informative, "Couldn't find Cakefile"
         end
 
-        puts 'Reading Cakefile...'
+        EventHooks.run_hook :before_cakefile_read
         file_contents = File.read(file_path)
 
         project = Project.new

data/lib/xcake/context/xcodeproj_context.rb

@@ -17,13 +17,11 @@ module Xcake
       when Node
         create_object_for_node(dsl_object)
       else
-        abort 'DSL Object not recognized!'
+        nil
       end
     end
 
     def create_object_for_project(project)
-      puts 'Creating Project...'
-
       # TODO: Make setup of project testable
       @project = Xcode::Project.new("./#{project.name}.xcodeproj", true)
       @project.setup_for_xcake
@@ -31,17 +29,14 @@ module Xcake
     end
 
     def create_object_for_target(target)
-      puts 'Creating Target...'
       @project.new_target(target)
     end
 
     def create_object_for_configuration(configuration)
-      puts 'Creating Configuration...'
       @project.new_configuration(configuration)
     end
 
     def create_object_for_node(node)
-      puts 'Creating Group...'
       @project.new_group(node)
     end
 

data/lib/xcake/event_hooks.rb

@@ -0,0 +1,90 @@
+require 'hooks'
+
+module Xcake
+  class EventHooks
+    include Hooks
+
+    # Defines hook which is ran after a Cakefile is initilized.
+    #
+    define_hooks :after_cakefile_init
+
+    # Defines hook which is ran before we start reading the cakefile
+    #
+    define_hooks :before_cakefile_read
+
+    # Defines hook which is ran before we start creating the Xcode Project
+    #
+    define_hooks :before_creating_xcode_project
+
+    # Defines hook which is ran before we start creating a Target
+    #
+    define_hooks :before_creating_target
+
+    # Defines hook which is ran before we start resolving
+    # issues with the Project structure
+    #
+    define_hooks :before_resolving_project_structure
+
+    # Defines hook which is ran before we start resolving
+    # issues with the Target structure
+    #
+    define_hooks :before_resolving_target_structure
+
+    # Defines hook which is ran before we start creating build configurations
+    # for a particular Xcode Project Object
+    #
+    define_hooks :before_creating_build_configurations
+
+    # Defines hook which is ran before we start creating a
+    # build configurations for a particular Xcode Project Object
+    #
+    define_hooks :before_creating_build_configuration
+
+    # Defines hook which is ran before we attach a XCConfig to a
+    # build configuration for a particular Xcode Project Object
+    #
+    define_hooks :before_attaching_xcconfig
+
+    # Defines hook which is ran before we add a system library
+    # to a target
+    #
+    define_hooks :before_adding_system_library
+
+    # Defines hook which is ran before we add a system framework
+    # to a target
+    #
+    define_hooks :before_adding_system_framework
+
+    # Defines hook which is ran before we add build phases
+    # to a target
+    #
+    define_hooks :before_adding_build_phases
+
+    # Defines hook which is ran before we create the user schemes
+    #
+    define_hooks :before_adding_user_schemes
+
+    # Defines hook which is ran before we add a file to the project
+    #
+    define_hooks :before_adding_file
+
+    # Defines hook which is ran before we add a custom build phase to
+    # a target
+    #
+    define_hooks :before_adding_custom_build_phase
+
+    # Defines hook which is ran before we add a embed watch app build phase to
+    # a target
+    #
+    define_hooks :before_adding_embed_watch_app_phase
+
+    # Defines hook which is ran before we add a embed watch extension build
+    # phase to a target
+    #
+    define_hooks :before_adding_embed_watch_extension_phase
+
+    # Defines hook which is ran after we save the generated project file
+    #
+    define_hooks :after_project_save
+  end
+end

data/lib/xcake/generator/configuration_generator.rb

@@ -18,17 +18,20 @@ module Xcake
     end
 
     def create_build_configurations_for(configuration_object)
-      puts "Creating build configurations for #{configuration_object}..."
+      EventHooks.run_hook :before_creating_build_configurations, configuration_object
 
       configuration_object.all_configurations.each do |configuration|
-        puts "Creating build configuration #{configuration.name} for #{configuration_object}..."
+        EventHooks.run_hook :before_creating_build_configuration, configuration, configuration_object
 
         build_configuration = @context.native_object_for(configuration)
         build_configuration.name = configuration.name
         build_configuration.build_settings = configuration.settings
 
-        configuration_file = configuration.configuration_file
-        file_reference = @context.file_reference_for_path(configuration_file)
+        unless configuration.configuration_file.nil?
+          EventHooks.run_hook :before_attaching_xcconfig, configuration
+          configuration_file = configuration.configuration_file
+          file_reference = @context.file_reference_for_path(configuration_file)
+        end
 
         build_configuration.base_configuration_reference = file_reference
 

data/lib/xcake/generator/project_generator.rb

@@ -10,7 +10,8 @@ module Xcake
       native_project = @context.native_object_for(project)
       native_project.save
       project.run_hook :after_save
-      puts 'Done!'
+
+      EventHooks.run_hook :after_project_save
     end
   end
 end

data/lib/xcake/generator/project_metadata_generator.rb

@@ -1,7 +1,7 @@
 module Xcake
   class ProjectMetadataGenerator < Generator
     def visit_project(project)
-      puts 'Creating Project...'
+      EventHooks.run_hook :before_creating_xcode_project
 
       native_project = @context.native_object_for(project)
       native_project.class_prefix = project.class_prefix if project.class_prefix

data/lib/xcake/generator/project_structure_generator.rb

@@ -10,8 +10,7 @@ module Xcake
     attr_accessor :project
 
     def visit_project(project)
-      puts 'Resolving Project...'
-
+      EventHooks.run_hook :before_resolving_project_structure, project
       @project = project
     end
 
@@ -19,7 +18,7 @@ module Xcake
     end
 
     def visit_target(target)
-      puts "Resolving target #{target}..."
+      EventHooks.run_hook :before_resolving_target_structure, target
 
       @project.all_configurations.each do |c|
         target.configuration(c.name, c.type)

data/lib/xcake/generator/scheme_generator.rb

@@ -5,7 +5,7 @@ module Xcake
     end
 
     def visit_project(project)
-      puts 'Creating User Schemes...'
+      EventHooks.run_hook :before_adding_user_schemes
 
       native_project = @context.native_object_for(project)
       native_project.recreate_user_schemes

data/lib/xcake/generator/target_build_phase_generator.rb

@@ -8,7 +8,7 @@ module Xcake
     end
 
     def visit_target(target)
-      puts "Generating build phases for #{target}..."
+      EventHooks.run_hook :before_adding_build_phases, target
 
       native_target = @context.native_object_for(target)
 
@@ -25,7 +25,7 @@ module Xcake
     end
 
     def create_embed_watchapp_phase(native_target, native_watchapp_target)
-      puts 'Generating embed watch app phase...'
+      EventHooks.run_hook :before_adding_embed_watch_app_phase
 
       phase = native_target.new_copy_files_build_phase('Embed Watch Content')
       phase.dst_path = '$(CONTENTS_FOLDER_PATH)/Watch'
@@ -35,9 +35,9 @@ module Xcake
     end
 
     def create_embed_watchapp_extension_phase(native_target, native_watchapp_extension_target)
-      puts 'Generating embed watch app extension phase...'
-      product_reference = native_watchapp_extension_target.product_reference
+      EventHooks.run_hook :before_adding_embed_watch_extension_phase
 
+      product_reference = native_watchapp_extension_target.product_reference
       phase = native_target.new_copy_files_build_phase('Embed App Extensions')
       phase.symbol_dst_subfolder_spec = :plug_ins
       phase.add_file_reference(product_reference, true)

data/lib/xcake/generator/target_custom_build_phase_generator.rb

@@ -8,7 +8,7 @@ module Xcake
       # TODO: Refactor this system.
       native_target = @context.native_object_for(target)
       target.build_phases.each do |phase|
-        puts "Adding custom phase \"#{phase.name}\" for #{target}"
+        EventHooks.run_hook :before_adding_custom_build_phase, phase, target
         phase.generate_native_build_phase(native_target)
       end
     end

data/lib/xcake/generator/target_file_reference_generator.rb

@@ -36,7 +36,8 @@ module Xcake
 
     def visit_node(node)
       return unless node.path
-      puts "Adding #{node.path}..."
+
+      EventHooks.run_hook :before_adding_file, node
 
       installer_class = @dependency_provider.tsort.detect do |i|
         i.can_install_node(node)

data/lib/xcake/generator/target_framework_generator.rb

@@ -5,12 +5,14 @@ module Xcake
     end
 
     def visit_target(target)
-      puts "Integrating System Frameworks for #{target}..."
+      unless target.system_frameworks.nil?
+        EventHooks.run_hook :before_adding_system_framework, target
 
-      native_target = @context.native_object_for(target)
+        native_target = @context.native_object_for(target)
 
-      system_frameworks = target.system_frameworks
-      native_target.add_system_frameworks(system_frameworks) if system_frameworks
+        system_frameworks = target.system_frameworks
+        native_target.add_system_frameworks(system_frameworks)
+      end
     end
   end
 end

data/lib/xcake/generator/target_generator.rb

@@ -5,7 +5,7 @@ module Xcake
     end
 
     def visit_target(target)
-      puts "Creating target #{target.name}..."
+      EventHooks.run_hook :before_creating_target, target
       @context.native_object_for(target)
     end
   end

data/lib/xcake/generator/target_library_generator.rb

@@ -5,12 +5,14 @@ module Xcake
     end
 
     def visit_target(target)
-      puts "Integrating System Libraries for #{target}..."
+      unless target.system_libraries.nil?
+        EventHooks.run_hook :before_adding_system_library, target
 
-      native_target = @context.native_object_for(target)
+        native_target = @context.native_object_for(target)
 
-      system_libraries = target.system_libraries
-      native_target.add_system_libraries(system_libraries) if system_libraries
+        system_libraries = target.system_libraries
+        native_target.add_system_libraries(system_libraries)
+      end
     end
   end
 end

data/lib/xcake/informative.rb

@@ -1,10 +1,6 @@
 require 'claide'
-require 'colored'
 
-# Indicates an user error.
-#
-# TODO: Move into UI Class
-#
+#TODO: Hook into UI Class somehow.
 module Xcake
   class Informative < StandardError
     include CLAide::InformativeError

data/lib/xcake/project/hooks.rb

@@ -3,7 +3,6 @@ require 'hooks'
 module Xcake
   class Project
     include Hooks
-    include Hooks::InstanceHooks
 
     # Defines hook which is ran after project is saved.
     #

data/lib/xcake/ui.rb

@@ -1,4 +1,89 @@
+require 'cork'
+
+# TODO: i18n this.
+# TODO: Different modes depending on --verbose, and CI
+# TODO: Split output and UI code into seperate concerns.
 module Xcake
   class UI
+    def self.register_ui_hooks
+
+      board = Cork::Board.new()
+
+      EventHooks.after_cakefile_init do
+        board.notice 'Open Cakefile to edit and run xcake make to get your xcode project'
+      end
+
+      EventHooks.before_cakefile_read do
+        board.puts_indented '- Reading Cakefile'
+      end
+
+      EventHooks.before_creating_xcode_project do
+        board.puts_indented '- Creating Project'
+      end
+
+      EventHooks.before_creating_target do |target|
+        board.puts_indented "- Creating #{target}"
+      end
+
+      EventHooks.before_resolving_project_structure do
+        board.puts_indented "- Resolving Project"
+      end
+
+      EventHooks.before_resolving_target_structure do |target|
+        board.puts_indented "- Resolving #{target}"
+      end
+
+      EventHooks.before_creating_build_configurations do |configurable|
+        board.puts_indented "- Creating build configurations for #{configurable}"
+      end
+
+      EventHooks.before_creating_build_configuration do |configuration, configurable|
+        board.puts_indented "- Creating build configuration #{configuration.name} for #{configurable}"
+      end
+
+      EventHooks.before_attaching_xcconfig do |configuration|
+        board.puts_indented "- Attaching XCConfig #{configuration.configuration_file} to build configuration #{configuration.name}"
+      end
+
+      EventHooks.before_adding_system_library do |target|
+        board.puts_indented "- Integrating System Libraries #{target.system_libraries} for #{target}"
+      end
+
+      EventHooks.before_adding_system_library do |target|
+        board.puts_indented "- Integrating System Libraries #{target.system_libraries} for #{target}"
+      end
+
+      EventHooks.before_adding_system_framework do |target|
+        board.puts_indented "- Integrating System Frameworks #{target.system_frameworks} for #{target}"
+      end
+
+      EventHooks.before_adding_build_phases do |target|
+        board.puts_indented "- Creating build phases for #{target}"
+      end
+
+      EventHooks.before_adding_user_schemes do
+        board.puts_indented '- Creating User Schemes'
+      end
+
+      EventHooks.before_adding_file do |node|
+        board.puts "- Adding #{node.path}"
+      end
+
+      EventHooks.before_adding_custom_build_phase do |phase, target|
+        board.puts "- Adding custom phase \"#{phase.name}\" for #{target}"
+      end
+
+      EventHooks.before_adding_embed_watch_app_phase do
+        board.puts '- Generating embed watch app phase...'
+      end
+
+      EventHooks.before_adding_embed_watch_extension_phase do
+        board.puts '- Generating embed watch extension phase...'
+      end
+
+      EventHooks.after_project_save do
+        board.notice 'Done!'
+      end
+    end
   end
 end

data/lib/xcake/version.rb

@@ -1,3 +1,3 @@
 module Xcake
-  VERSION = '0.6.20'.freeze
+  VERSION = '0.6.21'.freeze
 end

data/lib/xcake/xcode/project.rb

@@ -53,8 +53,6 @@ module Xcake
       end
 
       def recreate_user_schemes(*)
-        puts 'Creating Schemes...'
-
         scheme_list.recreate_schemes
         scheme_list.save(path)
       end

data/lib/xcake/xcode/scheme_list.rb

@@ -89,6 +89,8 @@ module Xcake
       # @param    [String] writing_path
       #           path to write to.
       #
+      # TODO: Move to a Generator
+      #
       def save(writing_path)
         schemes_dir = Scheme.user_data_dir(writing_path)
 
@@ -96,7 +98,6 @@ module Xcake
         FileUtils.mkdir_p(schemes_dir)
 
         schemes.each do |s|
-          puts "Saving Scheme #{s.name}..."
           s.save_as(@project.path, s.name, true)
 
           @xcschememanagement['SchemeUserState']["#{s.name}.xcscheme_^#shared#^_"] = {
@@ -104,8 +105,6 @@ module Xcake
           }
         end
 
-        puts 'Saving Scheme List...'
-
         xcschememanagement_path = schemes_dir + 'xcschememanagement.plist'
         write_plist(xcschememanagement_path)
       end

data/lib/xcake.rb

@@ -4,6 +4,7 @@ require 'xcake/core_ext/string'
 require 'xcake/modern_xcodeproj.rb'
 
 require 'xcake/version'
+require 'xcake/event_hooks'
 require 'xcake/ui'
 require 'xcake/informative'
 require 'xcake/command'

data/xcake.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'claide', '< 2.0', '>= 0.9.1'
   spec.add_dependency 'hooks', '~> 0.4.1'
   spec.add_dependency 'xcodeproj', '< 2.0.0', '>= 0.20'
-  spec.add_dependency 'colored'
+  spec.add_dependency 'cork'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcake
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - James Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,7 +163,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.20'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: cork
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -230,6 +230,7 @@ files:
 - lib/xcake/core_ext/string.rb
 - lib/xcake/dependency.rb
 - lib/xcake/dependency_provider.rb
+- lib/xcake/event_hooks.rb
 - lib/xcake/file_reference_installer.rb
 - lib/xcake/file_reference_installer/compile_source_file_reference_installer.rb
 - lib/xcake/file_reference_installer/compile_xcdatamodeld_file_reference_installer.rb