ambient-xcode 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bbb7285b674c2fb1324c0f6d6afccbac5ffd1e2
-  data.tar.gz: a377e66021a4f78dcccf8214994824f0431e059f
+  metadata.gz: 71ecb6caa8059718bc5587df94fefe7a7ded74e5
+  data.tar.gz: ace88b9f5419157c109fe6826af14e504a6e89fb
 SHA512:
-  metadata.gz: 34ed62a46022138cd638cadf3dcdc558a5e8d73e20d66e38c4a00c062e58d824c75d7890a6f6d0161ed236d9a5a07d9dacd5d3f44b6d254b1b658bffa934e230
-  data.tar.gz: b2f7e2018f8ed49945969744472d3468206eda18b5246057076ede084fcce3985b3f0ba73e6e32770adb44c0c7518adfb392307fcb7fc50498d155a6d2f7b583
+  metadata.gz: 75d57629a7ad52ab157454e511ef074475cfb5c7e656ef58e679bd942a78fc56a15d9566d1864da252383308042e05aea388ca2f9463f4475147190d09033603
+  data.tar.gz: 96233c4bb64322f6aac12d535aa44d04c0233384572ee65f2c8047703ed750aff898ef3babfc18b3e0204752e808928b195807cfd21e1d75c94309e603589ac6

data/README.md

@@ -1,20 +1,21 @@
 Ambient environment for Xcode projects
 ======================================
 
-Ambient lets you define all of your xcode project environment settings all in one easy to read Ruby file, and re-apply it to your Xcode project to ensure settings are correct.
+Ambient lets you define all of your Xcode project environment settings all in one easy to read Ruby file, and re-apply it to your Xcode project to ensure settings are correct.
 
 An `xcconfig` file can be used in order to help abstract your settings away from the main project file. The disadvantage of `xcconfig` files though is that they can still be overridden by settings defined in the project. Ambient doesn't have this issue as it simply overwrites the values in the project file.
 
+
 Installation
 ============
 
 Simply run:
-```
+```bash
 gem install ambient-xcode
 ```
 
 Or if you use Bundler, add the following to your `Gemfile`:
-```
+```ruby
 gem "ambient-xcode"
 ```
 
@@ -25,13 +26,7 @@ Create an `Ambientfile` defining your project in the same directory as your `*.x
 
 Here's a sample of the `Ambientfile` structure:
 ```ruby
-enable_default_warnings!
-use_defaults_for_everything_not_specified_in_this_file!
-
-option "IPHONEOS_DEPLOYMENT_TARGET", "7.0"
-option "SDKROOT", "iphoneos"
-option "CLANG_ENABLE_OBJC_ARC", true
-option "CLANG_ENABLE_MODULES", true
+base_ios_settings! "MyProject"
 
 target "MyProject" do
   capability :healthkit
@@ -42,17 +37,17 @@ target "MyProject" do
     option "BUNDLE_DISPLAY_NAME_SUFFIX", "uk.danielgreen.MyProject"
   end
 end
-```
 
-Name of the constant that can be used as an option is located in the **Quick Settings**
-![Constants](example/images/Constant.png)
+plist("MyProject/Info.plist") do
+  entry "LSApplicationQueriesSchemes", [ "dbapi-2", "dbapi-8-emm"]
+end
+```
 
 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) or [example Ambientfile-swift](https://github.com/Dan2552/ambient-xcode/blob/master/example/Ambientfile-swift) matches the exact settings of a new iOS project.
+If you want, you can have a multiple `Ambientfile` for the same project. Just name it something else and run `ambient [filename]` (e.g. `ambient Ambientfile-enterprise`)
 
-If for any reason you want multiple Ambientfile (maybe for example if you wanted different capabilities for an Enterprise build vs an AppStore build), you can:
-```
+```ruby
 use_settings_from 'Ambientfile' # inherits all of the settings from Ambientfile
 
 target "Monies" do
@@ -61,14 +56,15 @@ target "Monies" do
 end
 ```
 
-Just run `ambient [filename]` (e.g. `ambient Ambientfile-enterprise`)
 
 Notes
 =====
 
+- The [example Ambientfile](https://github.com/Dan2552/ambient-xcode/blob/master/example/Ambientfile) or [example Ambientfile-objc](https://github.com/Dan2552/ambient-xcode/blob/master/example/Ambientfile-objc) matches the exact settings of a new iOS project.
 - Use the `use_defaults_for_everything_not_specified_in_this_file!` setting to ensure your project file is clean. Warning though: this setting will clear all your targets' settings, so be sure to define absolutely every setting in the `Ambientfile` if you want to use this.
 - When defining settings directly within a target, the setting is set to each scheme.
-
+- The name of the constants used for `option` is located in the **Quick Help** section in Xcode
+![Constants](example/images/Constant.png)
 
 Possible future features
 ========================
@@ -77,6 +73,4 @@ Possible future features
 - Helper method to change build phases to default
 - Version number + build number
 - Provisioning profiles from searching by name rather than storing a uuid (so it actually works across teams)
-- `Info.plist` definitions
-- ?
 - Ability to not have to commit `*.xcodeproj` into version control (maybe too far?)

data/ambient-xcode.gemspec

@@ -3,8 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'ambient-xcode'
-  gem.version       = '0.5.1'
-  gem.authors       = ['Daniel Green']
+  gem.version       = '0.6.0'
+  gem.authors       = ['Daniel Inkpen']
   gem.email         = ['dan2552@gmail.com']
   gem.description   = %q{CLI for configuring Xcode projects from a Ruby file.}
   gem.summary       = %q{Define your envrionment settings all in one easy to read Ruby file, and re-apply it to your Xcode project to ensure settings are correct.}
@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_dependency 'xcodeproj', '~> 1.1.0'
+  gem.add_dependency 'plist', '~> 3.2.0'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/example/Ambientfile

@@ -1,63 +1,7 @@
-PROJECT = "MyProject"
+PROJECT = "EmptyProject"
 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
+base_ios_settings! PROJECT,
+                   prefix: PREFIX,
+                   tests: true,
+                   ui_tests: true

data/example/Ambientfile-objc

@@ -0,0 +1,8 @@
+PROJECT = "EmptyProject"
+PREFIX = "uk.danielgreen."
+
+base_ios_settings! PROJECT,
+                   prefix: PREFIX,
+                   tests: true,
+                   ui_tests: true,
+                   swift: false

data/example/{Ambientfile-swift → Ambientfile-verbose}

@@ -1,6 +1,3 @@
-PROJECT = "EmptySwiftProject"
-PREFIX = "uk.danielgreen."
-
 use_defaults_for_everything_not_specified_in_this_file!
 enable_default_warnings!
 

data/lib/ambient.rb

@@ -8,6 +8,7 @@ end
 
 require_relative 'project_helper'
 require_relative 'capabilities_helper'
+require_relative 'plist_helper'
 require_relative 'dsl'
 
 module Ambient
@@ -151,7 +152,7 @@ module Ambient
   end
 
   def run_ambientfile(filename)
-    puts "Reading settings from #{filename}"
+    puts "# Reading settings from #{filename}"
     ambient = File.join(Dir.pwd, filename)
     raise "#{filename} not found in current directory." unless File.exists?(ambient)
     load ambient

data/lib/dsl.rb

@@ -6,6 +6,80 @@ def option(name, value)
   Ambient.configure { set_option(name, value) }
 end
 
+def base_ios_settings!(project_name, prefix: "", tests: false, ui_tests: false, swift: true, target: nil, test_target: nil, ui_test_target: nil)
+  use_defaults_for_everything_not_specified_in_this_file!
+  enable_default_warnings!
+
+  target ||= "project_name"
+  test_target ||= "#{project_name}Tests"
+  ui_test_target ||= "#{project_name}UITests"
+  tests = true if test_target
+  ui_tests = true if ui_test_target
+
+  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)"]
+    option "SWIFT_OPTIMIZATION_LEVEL", "-Onone" if swift
+  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_name do
+    option "INFOPLIST_FILE", "#{project_name}/Info.plist"
+    option "PRODUCT_BUNDLE_IDENTIFIER", "#{prefix}#{project_name}"
+    option "ASSETCATALOG_COMPILER_APPICON_NAME", "AppIcon"
+    option "LD_RUNPATH_SEARCH_PATHS", "$(inherited) @executable_path/Frameworks"
+    option "PRODUCT_NAME", "$(TARGET_NAME)"
+  end
+
+  if tests
+    target test_target do
+      option "INFOPLIST_FILE", "#{project_name}Tests/Info.plist"
+      option "BUNDLE_LOADER", "$(TEST_HOST)"
+      option "TEST_HOST", "$(BUILT_PRODUCTS_DIR)/#{project_name}.app/#{project_name}"
+      option "PRODUCT_BUNDLE_IDENTIFIER", "#{prefix}#{project_name}Tests"
+      option "LD_RUNPATH_SEARCH_PATHS", "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
+      option "PRODUCT_NAME", "$(TARGET_NAME)"
+    end
+  end
+
+  if ui_tests
+    target ui_test_target do
+      option "INFOPLIST_FILE", "#{project_name}UITests/Info.plist"
+      option "TEST_TARGET_NAME", "#{project_name}"
+      option "PRODUCT_BUNDLE_IDENTIFIER", "#{prefix}#{project_name}UITests"
+      option "LD_RUNPATH_SEARCH_PATHS", "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
+      option "USES_XCTRUNNER", "YES"
+      option "PRODUCT_NAME", "$(TARGET_NAME)"
+    end
+  end
+end
+
 def enable_extra_warnings_and_static_analyser!
   warnings = %w(GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED
     GCC_WARN_MISSING_PARENTHESES
@@ -69,6 +143,26 @@ def scheme(name, parent: nil, &block)
   SchemeScope.new(nil, name, parent).configure(&block)
 end
 
+def plist(path, &block)
+  PlistScope.new(path).configure(&block)
+end
+
+class PlistScope
+  attr_reader :helper
+
+  def initialize(path)
+    @helper = PlistHelper.new(path)
+  end
+
+  def configure(&block)
+    instance_eval(&block)
+  end
+
+  def entry(key, value)
+    helper.add_entry(key, value)
+  end
+end
+
 class TargetScope
   attr_reader :name
 

data/lib/plist_helper.rb

@@ -0,0 +1,29 @@
+require 'plist'
+
+class PlistHelper
+  attr_reader :path
+
+  def initialize(path)
+    @path = path
+  end
+
+  def add_entry(key, value)
+    plist_as_dictionary[key] = value
+    puts "applying to plist: #{path} #{key}"
+    save
+  end
+
+  private
+
+  def plist_as_dictionary
+    @plist_as_dictionary ||= Plist::parse_xml(path)
+  end
+
+  def to_plist
+    plist_as_dictionary.to_plist
+  end
+
+  def save
+    File.open(path, 'w') { |file| file.write(to_plist) }
+  end
+end

data/lib/project_helper.rb

@@ -96,6 +96,7 @@ class ProjectHelper
   end
 
   def print_info
+    puts ""
     puts "Targets:"
     @project.targets.each { |t| puts "- #{t.to_s}" }
     puts ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ambient-xcode
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
-- Daniel Green
+- Daniel Inkpen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: CLI for configuring Xcode projects from a Ruby file.
 email:
 - dan2552@gmail.com
@@ -36,11 +50,13 @@ files:
 - ambient-xcode.gemspec
 - bin/ambient
 - example/Ambientfile
-- example/Ambientfile-swift
+- example/Ambientfile-objc
+- example/Ambientfile-verbose
 - example/images/Constant.png
 - lib/ambient.rb
 - lib/capabilities_helper.rb
 - lib/dsl.rb
+- lib/plist_helper.rb
 - lib/project_helper.rb
 homepage: https://github.com/Dan2552/ambient
 licenses: