ambient-xcode 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36a5027a9d319fa88b1bc45e45990b9553eca940
-  data.tar.gz: 2a9614d04af26567d4908708e4eb4d19bc4b34bd
+  metadata.gz: 74297d6847b0d837aeb70f2f86eecf4ff2644f6e
+  data.tar.gz: 8b4450eab0effc1c41ddcebc70c350d0aa9b05c7
 SHA512:
-  metadata.gz: 4d135a916846179681e5c28399993ad398619cb461f13922eb780c9becc88fa4741eac04837c55fc1d23ea8e8c67b9c91d563d1901f7bbf379113dbf5fa7f532
-  data.tar.gz: a8cee9b724b86123e98238f41e69f71b838b8cf93ee03fdcf6985d1088e210b28341516a235586b4d2e3adbbfa15986742e4f013a5406d90c5c75a7409a9069b
+  metadata.gz: 079fe3f096c467c9f7a35423cec8b13b14e601e88d14ee418987deac1fcadf9443ce3dd559fa257c831d90edaea443431344b20611e5f62b480ca49376dd74cc
+  data.tar.gz: 329c5495cf88b45dc37fb8c7078669ffc08c2da508c9cbf84552daa326835c222c94cb1acb61a63b213a701ca103d8c4cabefd21cf7c907e05cfc1b28b01208e

data/README.md

@@ -34,6 +34,9 @@ option "CLANG_ENABLE_OBJC_ARC", true
 option "CLANG_ENABLE_MODULES", true
 
 target "MyProject" do
+  capability :healthkit
+  capability :apple_pay
+
   scheme "Debug" do
     option "PRODUCT_NAME", "Debug"
     option "BUNDLE_DISPLAY_NAME_SUFFIX", "uk.danielgreen.MyProject"
@@ -45,6 +48,17 @@ 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.
 
+If for any reason you want multiple Ambientfile, you can:
+```
+use_settings_from 'Ambientfile'
+
+target "Babylon" do
+  capability :apple_pay
+end
+```
+
+Just run `ambient [filename]` (i.e. `ambient Ambientfile-enterprise`)
+
 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.2.0'
+  gem.version       = '0.3.0'
   gem.authors       = ['Daniel Green']
   gem.email         = ['dan2552@gmail.com']
   gem.description   = %q{CLI for configuring Xcode projects from a Ruby file.}
@@ -12,7 +12,6 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_dependency 'xcodeproj', '~> 0.25'
-  gem.add_dependency 'highline', '~> 1.6'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/bin/ambient

@@ -4,4 +4,5 @@ require 'fileutils'
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'ambient'
-Ambient.setup_project
+file = ARGV[0] || 'Ambientfile'
+Ambient.setup_project(file)

data/lib/ambient.rb

@@ -7,6 +7,7 @@ unless Kernel.respond_to?(:require_relative)
 end
 
 require_relative 'project_helper'
+require_relative 'capabilities_helper'
 require_relative 'dsl'
 
 module Ambient
@@ -19,6 +20,7 @@ module Ambient
   @target_options = {}
   @scheme_options = {}
   @parents = {}
+  @capabilities = {}
 
   def configure(&block)
     instance_eval &block
@@ -57,28 +59,38 @@ module Ambient
     end
   end
 
-  def setup_project
+  def set_capability(target_name, capability_name)
+    capabilities = @capabilities[target_name] ||= []
+    capabilities << capability_name
+  end
+
+  def setup_project(ambientfile)
+    run_ambientfile(ambientfile)
     project_helper.print_info
-    reset_project_to_defaults
-    reset_targets_to_defaults
+    reset_project_to_defaults if @use_defaults
+    reset_targets_to_defaults if @use_defaults
+    reset_capabilites_to_defaults if @use_defaults
     process_project_options
     process_scheme_options
     process_shared_target_options
     process_target_options
+    process_capabilities
+    project_helper.save_changes
   end
 
   def reset_project_to_defaults
-    if @use_defaults
-      puts "resetting project settings to xcode default settings"
-      project_helper.reset_project_to_defaults
-    end
+    puts "resetting project settings to xcode default settings"
+    project_helper.reset_project_to_defaults
   end
 
   def reset_targets_to_defaults
-    if @use_defaults
-      puts "resetting target settings to xcode default settings"
-      project_helper.reset_targets_to_defaults
-    end
+    puts "resetting target settings to xcode default settings"
+    project_helper.reset_targets_to_defaults
+  end
+
+  def reset_capabilites_to_defaults
+    puts "resetting capabilities to xcode default settings"
+    project_helper.reset_capabilities_to_defaults
   end
 
   def process_project_options
@@ -102,6 +114,11 @@ module Ambient
     project_helper.process_target_options(@target_options)
   end
 
+  def process_capabilities
+    puts "applying ambient capabilities"
+    project_helper.process_capabilities(@capabilities)
+  end
+
   def load_in_parent_target_values
     @parents.each do |target, parents|
       parents.each do |child, parent|
@@ -115,8 +132,10 @@ module Ambient
     end
   end
 
-  ambient = File.join(Dir.pwd, 'Ambientfile')
-  raise "ambient not found" unless File.exists?(ambient)
-
-  load ambient
+  def run_ambientfile(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
+  end
 end

data/lib/capabilities_helper.rb

@@ -0,0 +1,59 @@
+require 'xcodeproj'
+class CapabilitiesHelper
+  CAPABILITIES = {
+    application_group_ios: "ApplicationGroups.iOS",
+    background_modes: "BackgroundModes",
+    data_protection: "DataProtection",
+    game_center: "GameCenter",
+    healthkit: "HealthKit",
+    health_kit: "HealthKit",
+    homekit: "HomeKit",
+    home_kit: "HomeKit",
+    in_app_purchase: "InAppPurchase",
+    inter_app_audio: "InterAppAudio",
+    keychain: "Keychain",
+    maps: "Maps.iOS",
+    apple_pay: "OMC",
+    passbook: "Passbook",
+    wallet: "Passbook",
+    safari_keychain: "SafariKeychain",
+    personal_vpn: "VPNLite",
+    wireless_accessory_configuration: "WAC",
+    icloud: "iCloud"
+  }
+
+  def initialize(project, target)
+    @project = project
+    @target = target
+  end
+
+  def clear_capabilities
+    capabilities.delete_if { |_, _| true } if capabilities
+  end
+
+  def enable_capability(capability)
+    capabilities[capability_key(capability)] = {"enabled"=>"1"}
+  end
+
+  def disable_capability(capability)
+    capabilities.delete(capability_key(capability))
+  end
+
+  private
+
+  def capabilities
+    target_attributes["SystemCapabilities"]
+  end
+
+  def target_attributes
+    @project.root_object.attributes["TargetAttributes"][@target.uuid]
+  end
+
+  def capability_key(capability)
+    capability = CAPABILITIES[capability] || capability.to_s
+    prefix = "com.apple."
+    capability = "#{prefix}#{capability}" unless capability.start_with? prefix
+    capability
+  end
+
+end

data/lib/dsl.rb

@@ -1,3 +1,7 @@
+def use_settings_from(filename)
+  Ambient.configure { run_ambientfile(filename) }
+end
+
 def option(name, value)
   Ambient.configure { set_option(name, value) }
 end
@@ -84,6 +88,11 @@ class TargetScope
   def scheme(name, parent: nil, &block)
     SchemeScope.new(self, name, parent).configure(&block)
   end
+
+  def capability(capability_name)
+    target_name = @name
+    Ambient.configure { set_capability(target_name, capability_name) }
+  end
 end
 
 class SchemeScope

data/lib/project_helper.rb

@@ -1,5 +1,4 @@
 require 'xcodeproj'
-require 'highline/import'
 
 class ProjectHelper
   PROJECTS = Dir.glob('*.xcodeproj')
@@ -13,7 +12,6 @@ class ProjectHelper
       build_settings = configuration.build_settings
       build_settings.each { |k, _| build_settings.delete(k) }
     end
-    save_changes
   end
 
   def reset_targets_to_defaults
@@ -25,6 +23,12 @@ class ProjectHelper
     end
   end
 
+  def reset_capabilities_to_defaults
+    @project.targets.each do |target|
+      CapabilitiesHelper.new(@project, target).clear_capabilities
+    end
+  end
+
   def process_project_options(options)
     @project.build_configurations.each do |configuration|
       options.each do |key, value|
@@ -32,7 +36,6 @@ class ProjectHelper
         configuration.build_settings.delete(key) if value == nil
       end
     end
-    save_changes
   end
 
   def process_shared_target_options(shared_target_options)
@@ -44,7 +47,6 @@ class ProjectHelper
         end
       end
     end
-    save_changes
   end
 
   def process_target_options(target_options)
@@ -59,7 +61,17 @@ class ProjectHelper
         end
       end
     end
-    save_changes
+  end
+
+  def process_capabilities(capabilities_hash)
+    capabilities_hash.each do |target_name, capabilities|
+      @project.targets.each do |target|
+        if target_name == target.to_s
+          helper = CapabilitiesHelper.new(@project, target)
+          capabilities.each { |c| helper.enable_capability(c) }
+        end
+      end
+    end
   end
 
   def process_scheme_options(options)
@@ -70,7 +82,6 @@ class ProjectHelper
         configuration.build_settings.delete(key) if value == nil
       end
     end
-    save_changes
   end
 
   def print_info
@@ -82,9 +93,8 @@ class ProjectHelper
     puts ""
   end
 
-  private
-
   def save_changes
     @project.save
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ambient-xcode
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.25'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 description: CLI for configuring Xcode projects from a Ruby file.
 email:
 - dan2552@gmail.com
@@ -51,6 +37,7 @@ files:
 - bin/ambient
 - example/Ambientfile
 - lib/ambient.rb
+- lib/capabilities_helper.rb
 - lib/dsl.rb
 - lib/project_helper.rb
 homepage: https://github.com/Dan2552/ambient