ambient-xcode 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98615ee39dc25f247d8064579087ebdf523a796a
-  data.tar.gz: 7c0663d987218c7d8426e4957d12000d04ae7c43
+  metadata.gz: 36a5027a9d319fa88b1bc45e45990b9553eca940
+  data.tar.gz: 2a9614d04af26567d4908708e4eb4d19bc4b34bd
 SHA512:
-  metadata.gz: c504951669259411ab0d46c4c6423356afd05c913b2078fc0f77d7a9715d377d170e23d0fb7b8d7a50f66e9ea8308d447aa337a6db8819163ae0302c8868d16e
-  data.tar.gz: 0b4bf94607805be90413cd7cc3219bfcc5f2f2611be0ee37f8b592447768070113d3fd9276f19f121fa84b8e3f9d87d25a817980f90c25dddc81330e6e2ef8c6
+  metadata.gz: 4d135a916846179681e5c28399993ad398619cb461f13922eb780c9becc88fa4741eac04837c55fc1d23ea8e8c67b9c91d563d1901f7bbf379113dbf5fa7f532
+  data.tar.gz: a8cee9b724b86123e98238f41e69f71b838b8cf93ee03fdcf6985d1088e210b28341516a235586b4d2e3adbbfa15986742e4f013a5406d90c5c75a7409a9069b

data/README.md

@@ -8,9 +8,14 @@ An `xcconfig` file can be used in order to help abstract your settings away from
 Installation
 ============
 
-Add the following to your `Gemfile`:
+Simply run:
 ```
-gem "ambient-xcode", git: "https://github.com/Dan2552/ambient-xcode"
+gem install ambient-xcode
+```
+
+Or if you use Bundler, add the following to your `Gemfile`:
+```
+gem "ambient-xcode"
 ```
 
 Usage
@@ -18,9 +23,9 @@ Usage
 
 Create an `Ambientfile` defining your project in the same directory as your `*.xcodeproj` file.
 
-Here's an example of the `Ambientfile` structure:
+Here's a sample of the `Ambientfile` structure:
 ```ruby
-enable_warnings_and_static_analyser!
+enable_default_warnings!
 use_defaults_for_everything_not_specified_in_this_file!
 
 option "IPHONEOS_DEPLOYMENT_TARGET", "7.0"
@@ -36,7 +41,9 @@ target "MyProject" do
 end
 ```
 
-run `ambient` from the command line to write your settings into your project.
+Run `ambient` from the command line to write your settings into your project.
+
+The [example Ambientfile](https://github.com/Dan2552/ambient-xcode/blob/master/example/Ambientfile) matches the exact settings of a new iOS project.
 
 Notes
 =====

data/ambient-xcode.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'ambient-xcode'
-  gem.version       = '0.1.0'
+  gem.version       = '0.2.0'
   gem.authors       = ['Daniel Green']
   gem.email         = ['dan2552@gmail.com']
   gem.description   = %q{CLI for configuring Xcode projects from a Ruby file.}

data/example/Ambientfile

@@ -0,0 +1,63 @@
+PROJECT = "MyProject"
+PREFIX = "uk.danielgreen."
+
+use_defaults_for_everything_not_specified_in_this_file!
+enable_default_warnings!
+
+option "ALWAYS_SEARCH_USER_PATHS", false
+option "CLANG_CXX_LANGUAGE_STANDARD", "gnu++0x"
+option "CLANG_CXX_LIBRARY", "libc++"
+option "CLANG_ENABLE_MODULES", true
+option "CLANG_ENABLE_OBJC_ARC", true
+
+option "CODE_SIGN_IDENTITY[sdk=iphoneos*]", "iPhone Developer"
+option "COPY_PHASE_STRIP", false
+
+option "ENABLE_STRICT_OBJC_MSGSEND", true
+option "GCC_C_LANGUAGE_STANDARD", "gnu99"
+option "GCC_NO_COMMON_BLOCKS", true
+option "SDKROOT", "iphoneos"
+option "IPHONEOS_DEPLOYMENT_TARGET", "9.0"
+
+scheme "Debug" do
+  option "DEBUG_INFORMATION_FORMAT", "dwarf"
+  option "ENABLE_TESTABILITY", true
+  option "MTL_ENABLE_DEBUG_INFO", true
+  option "ONLY_ACTIVE_ARCH", true
+  option "GCC_DYNAMIC_NO_PIC", false
+  option "GCC_OPTIMIZATION_LEVEL", "0"
+  option "GCC_PREPROCESSOR_DEFINITIONS", ["DEBUG=1", "$(inherited)"]
+end
+
+scheme "Release" do
+  option "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym"
+  option "ENABLE_NS_ASSERTIONS", false
+  option "MTL_ENABLE_DEBUG_INFO", false
+  option "VALIDATE_PRODUCT", true
+end
+
+target "#{PROJECT}" do
+  option "INFOPLIST_FILE", "#{PROJECT}/Info.plist"
+  option "PRODUCT_BUNDLE_IDENTIFIER", "#{PREFIX}#{PROJECT}"
+  option "ASSETCATALOG_COMPILER_APPICON_NAME", "AppIcon"
+  option "LD_RUNPATH_SEARCH_PATHS", "$(inherited) @executable_path/Frameworks"
+  option "PRODUCT_NAME", "$(TARGET_NAME)"
+end
+
+target "#{PROJECT}Tests" do
+  option "INFOPLIST_FILE", "#{PROJECT}Tests/Info.plist"
+  option "BUNDLE_LOADER", "$(TEST_HOST)"
+  option "TEST_HOST", "$(BUILT_PRODUCTS_DIR)/#{PROJECT}.app/#{PROJECT}"
+  option "PRODUCT_BUNDLE_IDENTIFIER", "#{PREFIX}#{PROJECT}Tests"
+  option "LD_RUNPATH_SEARCH_PATHS", "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
+  option "PRODUCT_NAME", "$(TARGET_NAME)"
+end
+
+target "#{PROJECT}UITests" do
+  option "INFOPLIST_FILE", "#{PROJECT}UITests/Info.plist"
+  option "TEST_TARGET_NAME", "#{PROJECT}"
+  option "PRODUCT_BUNDLE_IDENTIFIER", "#{PREFIX}#{PROJECT}UITests"
+  option "LD_RUNPATH_SEARCH_PATHS", "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
+  option "USES_XCTRUNNER", "YES"
+  option "PRODUCT_NAME", "$(TARGET_NAME)"
+end

data/lib/ambient.rb

@@ -17,7 +17,9 @@ module Ambient
   @project_options = {}
   @shared_target_options = {}
   @target_options = {}
+  @scheme_options = {}
   @parents = {}
+
   def configure(&block)
     instance_eval &block
   end
@@ -42,12 +44,16 @@ module Ambient
         @target_options[target][scheme] ||= {}
         @target_options[target][scheme][option] = value
       else
-        # require 'pry'; binding.pry
         @shared_target_options[target] ||= {}
         @shared_target_options[target][option] = value
       end
     else
-      @project_options[option] = value
+      if scheme
+        @scheme_options[scheme] ||= {}
+        @scheme_options[scheme][option] = value
+      else
+        @project_options[option] = value
+      end
     end
   end
 
@@ -56,6 +62,7 @@ module Ambient
     reset_project_to_defaults
     reset_targets_to_defaults
     process_project_options
+    process_scheme_options
     process_shared_target_options
     process_target_options
   end
@@ -79,6 +86,11 @@ module Ambient
     project_helper.process_project_options(@project_options)
   end
 
+  def process_scheme_options
+    puts "applying ambient scheme settings"
+    project_helper.process_scheme_options(@scheme_options)
+  end
+
   def process_shared_target_options
     puts "applying ambient shared target settings"
     project_helper.process_shared_target_options(@shared_target_options)

data/lib/dsl.rb

@@ -2,7 +2,7 @@ def option(name, value)
   Ambient.configure { set_option(name, value) }
 end
 
-def enable_warnings_and_static_analyser!
+def enable_extra_warnings_and_static_analyser!
   warnings = %w(GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED
     GCC_WARN_MISSING_PARENTHESES
     GCC_WARN_ABOUT_RETURN_TYPE
@@ -31,6 +31,28 @@ def enable_warnings_and_static_analyser!
   warnings.each { |w| option(w, true) }
 end
 
+def enable_default_warnings!
+  truthy = %w(CLANG_WARN_BOOL_CONVERSION
+    CLANG_WARN_CONSTANT_CONVERSION
+    CLANG_WARN_EMPTY_BODY
+    CLANG_WARN_ENUM_CONVERSION
+    CLANG_WARN_INT_CONVERSION
+    CLANG_WARN_UNREACHABLE_CODE
+    CLANG_WARN__DUPLICATE_METHOD_MATCH
+    GCC_WARN_64_TO_32_BIT_CONVERSION
+    GCC_WARN_UNDECLARED_SELECTOR
+    GCC_WARN_UNUSED_FUNCTION
+    GCC_WARN_UNUSED_VARIABLE)
+  error = %w(CLANG_WARN_DIRECT_OBJC_ISA_USAGE
+    CLANG_WARN_OBJC_ROOT_CLASS
+    GCC_WARN_ABOUT_RETURN_TYPE)
+  aggressive = %w(GCC_WARN_UNINITIALIZED_AUTOS)
+
+  truthy.each { |w| option(w, true) }
+  error.each { |w| option(w, "YES_ERROR") }
+  aggressive.each { |w| option(w, "YES_AGGRESSIVE") }
+end
+
 def target(name, &block)
   TargetScope.new(name).configure(&block)
 end
@@ -39,6 +61,10 @@ def use_defaults_for_everything_not_specified_in_this_file!
   Ambient.configure { @use_defaults = true }
 end
 
+def scheme(name, parent: nil, &block)
+  SchemeScope.new(nil, name, parent).configure(&block)
+end
+
 class TargetScope
   attr_reader :name
 
@@ -67,7 +93,10 @@ class SchemeScope
     @parent = parent
 
     child = name
-    Ambient.configure { set_parent_target(target.name, child, parent) }
+
+    if @target
+      Ambient.configure { set_parent_target(target.name, child, parent) }
+    end
   end
 
   def configure(&block)
@@ -79,9 +108,10 @@ class SchemeScope
     name = @name
     parent = @parent
 
-    Ambient.configure do
-      # require 'pry'; binding.pry
-      set_option(option_name, value, target: target.name, scheme: name, parent: parent)
+    if target
+      Ambient.configure { set_option(option_name, value, target: target.name, scheme: name, parent: parent) }
+    else
+      Ambient.configure { set_option(option_name, value, scheme: name, parent: parent) }
     end
   end
 end

data/lib/project_helper.rb

@@ -62,6 +62,17 @@ class ProjectHelper
     save_changes
   end
 
+  def process_scheme_options(options)
+    @project.build_configurations.each do |configuration|
+      scheme_options = options[configuration.to_s] || {}
+      scheme_options.each do |key, value|
+        configuration.build_settings[key] = value
+        configuration.build_settings.delete(key) if value == nil
+      end
+    end
+    save_changes
+  end
+
   def print_info
     puts "Targets:"
     @project.targets.each { |t| puts "- #{t.to_s}" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ambient-xcode
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -49,6 +49,7 @@ files:
 - README.md
 - ambient-xcode.gemspec
 - bin/ambient
+- example/Ambientfile
 - lib/ambient.rb
 - lib/dsl.rb
 - lib/project_helper.rb