ambient-xcode 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71ecb6caa8059718bc5587df94fefe7a7ded74e5
-  data.tar.gz: ace88b9f5419157c109fe6826af14e504a6e89fb
+  metadata.gz: 535741512152decacc083ba6036ccbd108c87d4f
+  data.tar.gz: da77b7cd41fa0585720138b545bf51e4f983153e
 SHA512:
-  metadata.gz: 75d57629a7ad52ab157454e511ef074475cfb5c7e656ef58e679bd942a78fc56a15d9566d1864da252383308042e05aea388ca2f9463f4475147190d09033603
-  data.tar.gz: 96233c4bb64322f6aac12d535aa44d04c0233384572ee65f2c8047703ed750aff898ef3babfc18b3e0204752e808928b195807cfd21e1d75c94309e603589ac6
+  metadata.gz: 72734e410a4173855c755e17f13504afff8090bb9e6eb17110ed5365e5e63c6a7d0bc1c388ce7db73249d203f8370e075b6e1510e59492de6c8b96dd3055205d
+  data.tar.gz: 5596a7103942b59e4f3e57808956d3d6ad17cf5665a478ae78ba3f8c981678da259e38cc12afcfaf95236d284a6423113d8006d841341495b45721f283b5e46e

data/.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+
+tags

data/README.md

@@ -43,12 +43,22 @@ plist("MyProject/Info.plist") 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:
+```
+usage:
+$ ambient COMMAND
+
+Commands:
++ [no arguments]	Applies the settings from the Ambientfile
++ init			Creates an Ambientfile in the current directory
++ new NAME		Creates a new iOS Xcode project with given name
++ [anything else]	Applies the settings from the file name supplied
+```
 
-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`)
+You can also have more than one `Ambientfile` for the same project. Just name it something else and run `ambient [filename]` (e.g. `ambient Ambientfile-enterprise`). Use `use_settings_from` to inherit settings:
 
 ```ruby
-use_settings_from 'Ambientfile' # inherits all of the settings from Ambientfile
+use_settings_from 'Ambientfile'
 
 target "Monies" do
   development_team "341MONEY25"

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.6.0'
+  gem.version       = '0.7.0'
   gem.authors       = ['Daniel Inkpen']
   gem.email         = ['dan2552@gmail.com']
   gem.description   = %q{CLI for configuring Xcode projects from a Ruby file.}

data/bin/ambient

@@ -4,5 +4,35 @@ require 'fileutils'
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'ambient'
-file = ARGV[0] || 'Ambientfile'
-Ambient.setup_project(file)
+
+def print_help
+  print_version
+  puts ""
+  puts "usage: "
+  puts "$ ambient COMMAND"
+  puts ""
+  puts "Commands:"
+  puts "+ [no arguments]\tApplies the settings from the Ambientfile"
+  puts "+ init\t\t\tCreates an Ambientfile in the current directory"
+  puts "+ new NAME\t\tCreates a new iOS Xcode project with given name"
+  puts "+ [anything else]\tApplies the settings from the file name supplied"
+end
+
+def print_version
+  path = File.expand_path("../../", __FILE__)
+  gem_contents = File.read("#{path}/ambient-xcode.gemspec")
+  match = gem_contents.match /^\s*gem.version\s*= ('|")(.*)('|")/
+  puts "ambient-xcode #{match[2]}"
+end
+
+if ARGV[0] == "init"
+  Ambient::Init.new.create_ambientfile
+elsif ARGV[0] == "new"
+  Ambient::ProjectCreation.new(Dir.pwd, ARGV[1]).create_ios_project
+elsif ARGV[0] == "help" || ARGV[0] == "--help"
+  print_help
+elsif ARGV[0] == "version" || ARGV[0] == "--version" || ARGV[0] == "-v"
+  print_version
+else
+  Ambient::Application.new.run_ambientfile(ARGV[0])
+end

data/example/Ambientfile

@@ -1,5 +1,5 @@
-PROJECT = "EmptyProject"
-PREFIX = "uk.danielgreen."
+PROJECT = "MyProject"
+PREFIX = "com.organization."
 
 base_ios_settings! PROJECT,
                    prefix: PREFIX,

data/example/Ambientfile-objc

@@ -1,5 +1,5 @@
-PROJECT = "EmptyProject"
-PREFIX = "uk.danielgreen."
+PROJECT = "MyProject"
+PREFIX = "com.organization."
 
 base_ios_settings! PROJECT,
                    prefix: PREFIX,

data/lib/ambient.rb

@@ -1,160 +1,10 @@
-unless Kernel.respond_to?(:require_relative)
-  module Kernel
-    def require_relative(path)
-      require File.join(File.dirname(caller[0]), path.to_str)
-    end
-  end
-end
-
-require_relative 'project_helper'
-require_relative 'capabilities_helper'
-require_relative 'plist_helper'
-require_relative 'dsl'
-
-module Ambient
-  extend self
-  Ambient::ROOT = File.expand_path('.', File.dirname(__FILE__))
-
-  @use_defaults = false
-  @project_options = {}
-  @shared_target_options = {}
-  @target_options = {}
-  @scheme_options = {}
-  @parents = {}
-  @capabilities = {}
-  @development_teams = {}
-
-  def configure(&block)
-    instance_eval &block
-  end
-
-  def project_helper
-    @project_helper ||= ProjectHelper.new
-  end
-
-  def set_parent_scheme(target: nil, child: nil, parent: nil)
-    target = target || :all
-    @parents[target] ||= {}
-    @parents[target][child] = parent
-  end
-
-  def set_option(option, value, target: nil, scheme: nil, parent: nil)
-    value = "YES" if value == true
-    value = "NO" if value == false
-    value = nil if value == :default
-
-    if target
-      if scheme
-        @target_options[target] ||= {}
-        @target_options[target][scheme] ||= {}
-        @target_options[target][scheme][option] = value
-      else
-        @shared_target_options[target] ||= {}
-        @shared_target_options[target][option] = value
-      end
-    else
-      if scheme
-        @scheme_options[scheme] ||= {}
-        @scheme_options[scheme][option] = value
-      else
-        @project_options[option] = value
-      end
-    end
-  end
-
-  def set_capability(target_name, capability_name)
-    capabilities = @capabilities[target_name] ||= []
-    capabilities << capability_name
-  end
-
-  def set_development_team(target_name, team_name)
-    @development_teams[target_name] = team_name
-  end
-
-  def setup_project(ambientfile)
-    run_ambientfile(ambientfile)
-    project_helper.print_info
-    reset_project_to_defaults if @use_defaults
-    reset_targets_to_defaults if @use_defaults
-    reset_capabilites_to_defaults if @use_defaults
-    load_in_parent_scheme_values
-    process_project_options
-    process_scheme_options
-    process_shared_target_options
-    process_target_options
-    process_capabilities
-    process_development_teams
-    project_helper.save_changes
-  end
-
-  def reset_project_to_defaults
-    puts "resetting project settings to xcode default settings"
-    project_helper.reset_project_to_defaults
-  end
-
-  def reset_targets_to_defaults
-    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
-    puts "applying ambient project settings"
-    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)
-  end
-
-  def process_target_options
-    puts "applying ambient target settings"
-    project_helper.process_target_options(@target_options)
-  end
-
-  def process_capabilities
-    puts "applying ambient capabilities"
-    project_helper.process_capabilities(@capabilities)
-  end
-
-  def process_development_teams
-    puts "applying ambient development teams"
-    project_helper.process_development_teams(@development_teams)
-  end
-
-  def load_in_parent_scheme_values
-    @parents.each do |target, parents|
-      parents.each do |child, parent|
-        if parent
-          if target == :all
-            puts "Identified #{child} as a child of #{parent}"
-            child_options = @scheme_options[child]
-            parent_options = @scheme_options[parent]
-          else
-            target_options = @target_options[target]
-            child_options = target_options[child]
-            parent_options = target_options[parent]
-          end
-          child_options.merge!(parent_options) { |_, child, _| child }
-        end
-      end
-    end
-  end
-
-  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
+require 'xcodeproj'
+require 'plist'
+
+require_relative 'ambient/project_helper'
+require_relative 'ambient/capabilities_helper'
+require_relative 'ambient/plist_helper'
+require_relative 'ambient/dsl'
+require_relative 'ambient/project_creation'
+require_relative 'ambient/init'
+require_relative 'ambient/application'

data/lib/ambient/application.rb

@@ -0,0 +1,165 @@
+module Ambient
+  class Application
+    attr_reader :path
+
+    def initialize(path = nil)
+      @path = path || File.expand_path('.', File.dirname(__FILE__))
+
+      @use_defaults = false
+      @project_options = {}
+      @shared_target_options = {}
+      @target_options = {}
+      @scheme_options = {}
+      @parents = {}
+      @capabilities = {}
+      @development_teams = {}
+    end
+
+    def run_ambientfile(file = nil)
+      setup_project(file || "Ambientfile")
+    end
+
+    def configure(&block)
+      instance_eval(&block)
+    end
+
+    private
+
+    def project_helper
+      @project_helper ||= ProjectHelper.new(path)
+    end
+
+    def set_parent_scheme(target: nil, child: nil, parent: nil)
+      target = target || :all
+      @parents[target] ||= {}
+      @parents[target][child] = parent
+    end
+
+    def set_option(option, value, target: nil, scheme: nil, parent: nil)
+      value = "YES" if value == true
+      value = "NO" if value == false
+      value = nil if value == :default
+
+      if target
+        if scheme
+          @target_options[target] ||= {}
+          @target_options[target][scheme] ||= {}
+          @target_options[target][scheme][option] = value
+        else
+          @shared_target_options[target] ||= {}
+          @shared_target_options[target][option] = value
+        end
+      else
+        if scheme
+          @scheme_options[scheme] ||= {}
+          @scheme_options[scheme][option] = value
+        else
+          @project_options[option] = value
+        end
+      end
+    end
+
+    def set_capability(target_name, capability_name)
+      capabilities = @capabilities[target_name] ||= []
+      capabilities << capability_name
+    end
+
+    def set_development_team(target_name, team_name)
+      @development_teams[target_name] = team_name
+    end
+
+    def setup_project(ambientfile)
+      read(ambientfile)
+      project_helper.print_info
+      reset_project_to_defaults if @use_defaults
+      reset_targets_to_defaults if @use_defaults
+      reset_capabilites_to_defaults if @use_defaults
+      load_in_parent_scheme_values
+      process_project_options
+      process_scheme_options
+      process_shared_target_options
+      process_target_options
+      process_capabilities
+      process_development_teams
+      project_helper.save_changes
+    end
+
+    def reset_project_to_defaults
+      puts "resetting project settings to xcode default settings"
+      project_helper.reset_project_to_defaults
+    end
+
+    def reset_targets_to_defaults
+      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
+      puts "applying ambient project settings"
+      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)
+    end
+
+    def process_target_options
+      puts "applying ambient target settings"
+      project_helper.process_target_options(@target_options)
+    end
+
+    def process_capabilities
+      puts "applying ambient capabilities"
+      project_helper.process_capabilities(@capabilities)
+    end
+
+    def process_development_teams
+      puts "applying ambient development teams"
+      project_helper.process_development_teams(@development_teams)
+    end
+
+    def load_in_parent_scheme_values
+      @parents.each do |target, parents|
+        parents.each do |child, parent|
+          if parent
+            if target == :all
+              puts "Identified #{child} as a child of #{parent}"
+              child_options = @scheme_options[child]
+              parent_options = @scheme_options[parent]
+            else
+              target_options = @target_options[target]
+              child_options = target_options[child]
+              parent_options = target_options[parent]
+            end
+            child_options.merge!(parent_options) { |_, child, _| child }
+          end
+        end
+      end
+    end
+
+    def read(filename)
+      puts "# Reading settings from #{filename}"
+      ambient = File.join(path, filename)
+
+      unless File.exists?(ambient)
+        puts "😱  #{filename} not found in current directory."
+        exit 1
+      end
+
+      DSL::MainScope.new(self).instance_eval do
+        eval(File.read(ambient))
+      end
+    end
+  end
+end