tug 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08744a632238e996beb4a29db85fa89e7ee20faf
-  data.tar.gz: bc0865da0127107943b503ae3fc0a47fd9dbc649
+  metadata.gz: a3a19cbd80c7658c71fc5354c84c7703b52b33d6
+  data.tar.gz: 5669abeb191d05076e9a98b6429f7f3462ce887a
 SHA512:
-  metadata.gz: 5487f7da527020af59fbde33153f96fe9db0b0f7fe91c764ccb6ed590e3306c9c771916f60abcf460a7ad70d61bd86d46804b524535e6306f7d1fbb780d05b4d
-  data.tar.gz: 55f6d92f1d195674df38b819a81220bf9881303b248572c4310467e277c43cee02888cd141c33c358f24549fc484275f8f34f028dbd326f124c88d30d08bf1f7
+  metadata.gz: 49cc50b509c9a4c45de9c77eb501af64c889a026aae9c4ab292f0c1be18249885e82f9dc6f8e52d7ec41d7d656ad2430881dec0888f498daafd9623b058bec10
+  data.tar.gz: 102358c25830e6457f3bd5cd91492429da44bee78445690579173829ffe56cd3ee4173cdbe45dbe96fc601b70eea017d82e0ba6ce7a4fdaf608787c5a1f11fe1

data/README.md

@@ -33,7 +33,7 @@ Run `tug ipa` from your Xcode projects root directory, see the example config be
 
 ### Config
 
-tug will look in the currenty directory for a `.tug.yml` config file by default, use the `--config` option to pass a path to your config file if it's in a different folder. 
+tug will look in the current directory for a `.tug.yml` config file by default, use the `--config` option to pass a path to your config file if it's in a different folder. 
 
 A sample config file:
 
@@ -45,6 +45,35 @@ project:
   ipa_config: Release            # The configuration to use to build ipas
 ```
 
+### Provisioning
+
+Provisioning requires you to export the following files from your keychain and place them within your project directory:
+
+* Apple Worldwide Developer Relations Certificate
+* iPhone Distribution Certificate
+* iPhone Distribution Private Key
+* Distribution Provisioning Profile
+
+Run `tug provision` to provision a new machine ready for signing ipas, provisioning requires a `keychain` object in the config yaml file to specify the path to the provisioning certificates and profile:
+
+```
+keychain:
+  apple_certificate: certs/apple.cer
+  distribution_certificate: certs/dist.cer
+  distribution_profile: certs/profile.mobileprovision
+  private_key: certs/dist.p12
+```
+
+#### Private Key Password
+
+If your `.p12` private key requires a password, you can either set the environment variable:
+
+`$ export TUG_P12_PASSWORD=yourpassword`
+
+or use the `--password` option when running the provision command:
+
+`$ tug provision --password yourpassword`
+
 ## Contributing
 
 1. Fork it

data/lib/tug/command/command.rb

@@ -8,13 +8,16 @@ module Tug
           Tug::BuildCommand.new
         when "ipa"
           Tug::IpaCommand.new
+        when "provision"
+          Tug::ProvisionCommand.new
         else
           Tug::Command.new
         end
       end
     end
 
-    def execute(project)
+    def execute(config_file)
+      project = config_file.project
       @xctool = xctool(project.ipa_config)
       project.schemes.each do |scheme|
         @xctool.build(project.workspace, scheme)

data/lib/tug/command/ipa_command.rb

@@ -1,10 +1,10 @@
 module Tug
   class IpaCommand < Command
 
-    def execute(project)
+    def execute(config_file)
       super
-      export_ipa(project)
-      move_ipa(project)
+      export_ipa(config_file.project)
+      move_ipa(config_file.project)
     end
 
     private

data/lib/tug/command/provision_command.rb

@@ -0,0 +1,15 @@
+module Tug
+  class ProvisionCommand < Command
+
+    def execute(config_file)
+      keychain = config_file.keychain
+
+      keychain.create_keychain
+      keychain.select_keychain(keychain.name)
+      keychain.import_apple_certificate
+      keychain.import_distribution_certificate
+      keychain.import_private_key
+      keychain.import_profile
+    end
+  end
+end

data/lib/tug/config/.tug.yml

@@ -2,4 +2,9 @@ project:
   workspace: tug.xcworkspace
   schemes:
     - tug
-  ipa_config: InHouse
+  ipa_config: InHouse
+keychain:
+  apple_certificate: apple.cer
+  distribution_certificate: dist.cer
+  distribution_profile: profile.mobileprovision
+  private_key: dist.p12

data/lib/tug/config/config_file.rb

@@ -2,6 +2,7 @@ module Tug
   class ConfigFile
 
     attr_reader :project
+    attr_reader :keychain
 
     class << self
       def config_file(path=default_path)
@@ -16,6 +17,7 @@ module Tug
     def initialize(path)
       config = YAML::load_file(path)
       @project = Tug::Project.new(config['project'])
+      @keychain = Tug::Keychain.keychain(config['keychain'])
     end
 
     private

data/lib/tug/interface/interface.rb

@@ -2,26 +2,36 @@ module Tug
   class Interface < Thor
 
     desc "build", "build a project"
-    option :config, :default => "#{Dir.pwd}/.tug.yml"
+    option :config, :default => "#{Dir.pwd}/.tug.yml", :aliases => "-c"
     def build
       config_file = Tug::ConfigFile.config_file(options[:config])
-      execute(__method__.to_s, config_file.project)
+      execute(__method__.to_s, config_file)
     end
 
     desc "ipa", "generate an ipa"
-    option :config, :default => "#{Dir.pwd}/.tug.yml"
-    option :export, :default => "#{Dir.pwd}"
+    option :config, :default => "#{Dir.pwd}/.tug.yml", :aliases => "-c"
+    option :export, :default => "#{Dir.pwd}", :aliases => "-e"
     def ipa
       config_file = Tug::ConfigFile.config_file(options[:config])
-      project = config_file.project
-      project.ipa_export_path = options[:export]
-      execute(__method__.to_s, project)
+      config_file.project.ipa_export_path = options[:export]
+      execute(__method__.to_s, config_file)
+    end
+
+    desc "provision", "provision system distrubution certificates and provisioning profile"
+    option :config, :default => "#{Dir.pwd}/.tug.yml", :aliases => "-c"
+    option :keychain, :default => "tug", :aliases => "-k"
+    option :password, :aliases => "-p"
+    def provision
+      config_file = Tug::ConfigFile.config_file(options[:config])
+      config_file.keychain.name = options[:keychain]
+      config_file.keychain.private_key_password = options[:password]
+      execute(__method__.to_s, config_file)
     end
 
     no_commands do
-      def execute(command, project)
+      def execute(command, config_file)
         command = Tug::Command.command_for_string(command)
-        command.execute(project)
+        command.execute(config_file)
       end
     end
   end

data/lib/tug/keychain/keychain.rb

@@ -0,0 +1,69 @@
+module Tug
+  class Keychain
+
+    attr_reader :apple_certificate
+    attr_reader :distribution_certificate
+    attr_reader :distribution_profile
+    attr_reader :private_key
+    attr_accessor :private_key_password
+    attr_accessor :name
+
+    class << self
+      def keychain(keychain_yaml)
+        Tug::Keychain.new(keychain_yaml)
+      end
+    end
+
+    def initialize(keychain_yaml)
+      @apple_certificate          = keychain_yaml["apple_certificate"]
+      @distribution_certificate   = keychain_yaml["distribution_certificate"]
+      @distribution_profile       = keychain_yaml["distribution_profile"]
+      @private_key                = keychain_yaml["private_key"]
+      @private_key_password       = ENV['TUG_P12_PASSWORD']
+      @name                       = "tug"
+    end
+
+    def create_keychain
+      system("security create-keychain -p tug #{name}.keychain")
+    end
+
+    def select_keychain(keychain_name=name)
+      system("security default-keychain -s #{keychain_name}.keychain")
+    end
+
+    def delete_keychain
+      system("security delete-keychain #{name}.keychain")
+    end
+
+    def import_apple_certificate
+      system(import_command(apple_certificate))
+    end
+
+    def import_distribution_certificate
+      system(import_command(distribution_certificate))
+    end
+
+    def import_private_key
+      system(import_command(private_key) + " -P '#{private_key_password}'")
+    end
+
+    def import_profile
+      FileUtils.mkdir_p "#{File.expand_path('~')}/Library/MobileDevice/Provisioning\ Profiles/"
+      system("cp #{distribution_profile} #{profile_export_path}")
+    end
+
+    private
+
+    def profile_export_path
+      "#{File.expand_path('~')}/Library/MobileDevice/Provisioning\\ Profiles/"
+    end
+
+    def import_command(file)
+      "security import #{file} -k #{keychain_path} -T /usr/bin/codesign"
+    end
+
+    def keychain_path
+      "#{File.expand_path('~')}/Library/Keychains/#{name}.keychain"
+    end
+  end
+end

data/lib/tug/version.rb

@@ -1,3 +1,3 @@
 module Tug
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/tug.rb

@@ -7,6 +7,7 @@ require "tug/version"
 require "tug/command/command"
 require "tug/command/build_command"
 require "tug/command/ipa_command"
+require "tug/command/provision_command"
 
 require "tug/interface/interface"
 
@@ -18,4 +19,6 @@ require "tug/project/project"
 require "tug/tool/xcode_build"
 require "tug/tool/xctool"
 require "tug/tool/xctool_build"
-require "tug/tool/xctool_archive"
+require "tug/tool/xctool_archive"
+
+require "tug/keychain/keychain"

data/spec/build_command_spec.rb

@@ -8,11 +8,14 @@ describe Tug::BuildCommand do
       @command = Tug::BuildCommand.new
       allow(@command).to receive(:system)
       @project = Tug::Project.new(project_yaml)
+
+      @config = double(Tug::ConfigFile)
+      allow(@config).to receive(:project).and_return(@project)
     end
 
     it "should build using xctool" do
       expect_any_instance_of(Tug::XCTool).to receive(:system).with("xctool -workspace workspace -scheme scheme -configuration Debug -sdk iphonesimulator")
-      @command.execute(@project)
+      @command.execute(@config)
     end
   end
 end

data/spec/command_spec.rb

@@ -21,5 +21,10 @@ describe Tug::Command do
       command = Tug::Command.command_for_string("hello")
       expect(command).to be_kind_of(Tug::Command)
     end
+
+    it "should return a provision command" do
+      command = Tug::Command.command_for_string("provision")
+      expect(command).to be_kind_of(Tug::ProvisionCommand)
+    end
   end
 end

data/spec/config_file_spec.rb

@@ -2,8 +2,9 @@ require "spec_helper"
 
 describe Tug::ConfigFile do
 
-  before(:each) do
-    config = {'project' => {'workspace' => 'hello', 'schemes' => ["world"], 'ipa_config' => 'config'}}
+  before(:each) do  
+    file = File.expand_path(File.join(File.dirname(__FILE__), "../lib/tug/config/.tug.yml"))
+    config = YAML.load_file(file)
     allow(YAML).to receive(:load_file).and_return(config)
     @config_file = Tug::ConfigFile.new("path")
   end
@@ -27,5 +28,9 @@ describe Tug::ConfigFile do
     it "should load a project" do
       expect(@config_file.project).to be
     end
+
+    it "should load a keychain" do
+      expect(@config_file.keychain).to be
+    end
   end
 end

data/spec/ipa_command_spec.rb

@@ -12,22 +12,25 @@ describe Tug::IpaCommand do
       yaml = project_yaml
       yaml["ipa_config"] = "InHouse"
       @project = Tug::Project.new(yaml)
+
+      @config = double(Tug::ConfigFile)
+      allow(@config).to receive(:project).and_return(@project)
     end
 
     it "should generate an archive using xctool" do
       expect_any_instance_of(Tug::XCTool).to receive(:system).with("xctool -workspace workspace -scheme scheme -configuration InHouse archive -archivePath /tmp/scheme.xcarchive")
-      @command.execute(@project)
+      @command.execute(@config)
     end
 
     it "should export an ipa using xcode build" do
       expect_any_instance_of(Tug::XcodeBuild).to receive(:system).with("xcodebuild -archivePath /tmp/scheme.xcarchive -exportPath /tmp/scheme.ipa -exportFormat ipa -exportArchive -exportWithOriginalSigningIdentity")
-      @command.execute(@project)
+      @command.execute(@config)
     end
 
     it "should move the ipa file into the export path location" do
       @project.ipa_export_path = "/hello/world"
       expect(FileUtils).to receive(:mv).with(anything, /hello\/world/)
-      @command.execute(@project)
+      @command.execute(@config)
     end
   end
 end

data/spec/keychain_spec.rb

@@ -0,0 +1,113 @@
+require "spec_helper"
+
+describe Tug::Keychain do 
+
+  before(:each) do
+    @yaml = {"apple_certificate" => "apple", 
+            "distribution_certificate" => "dist", 
+            "distribution_profile" => "path/to/profile", 
+            "private_key" => "private"}
+
+    @keychain = Tug::Keychain.keychain(@yaml)
+    allow(@keychain).to receive(:system)
+  end
+
+  describe "when returning keychains" do
+    it "should return a keychian" do
+    end
+
+    it "should return a protected keychain if password is missing" do
+    end
+  end
+
+  describe "when created" do
+    it "should have a apple certificate" do
+      expect(@keychain.apple_certificate).to be
+    end
+
+    it "should have a distribution certificate" do
+      expect(@keychain.distribution_certificate).to be
+    end
+
+    it "should have a distribution profile" do
+      expect(@keychain.distribution_profile).to be
+    end
+
+    it "should have a private key" do
+      expect(@keychain.private_key).to be
+    end
+
+    it "should have a default keychain name" do
+      expect(@keychain.name).to match("tug")
+    end
+  end
+
+  describe "when importing certificates" do
+
+    it "should select a keychain" do
+      expect(@keychain).to receive(:system).with("security default-keychain -s test.keychain")
+      @keychain.select_keychain("test")
+    end
+
+    it "should create a keychain" do
+      expect(@keychain).to receive(:system).with("security create-keychain -p tug tug.keychain")
+      @keychain.create_keychain
+    end
+
+    it "should delete a keychain" do
+      expect(@keychain).to receive(:system).with("security delete-keychain tug.keychain")
+      @keychain.delete_keychain
+    end
+
+    it "should import the apple certificate" do
+      expect(@keychain).to receive(:system).with("security import apple -k #{File.expand_path('~')}/Library/Keychains/tug.keychain -T /usr/bin/codesign")
+      @keychain.import_apple_certificate
+    end
+
+    it "should import the dist certificate" do
+      expect(@keychain).to receive(:system).with("security import dist -k #{File.expand_path('~')}/Library/Keychains/tug.keychain -T /usr/bin/codesign")
+      @keychain.import_distribution_certificate
+    end
+
+    it "should import the private key" do
+      ENV['TUG_P12_PASSWORD'] = nil
+      @keychain = Tug::Keychain.keychain(@yaml)
+
+      expect(@keychain).to receive(:system).with("security import private -k #{File.expand_path('~')}/Library/Keychains/tug.keychain -T /usr/bin/codesign -P ''")
+      @keychain.import_private_key
+    end
+
+    it "should import the private key with a password via env var" do
+      ENV['TUG_P12_PASSWORD'] = "password"
+      @keychain = Tug::Keychain.keychain(@yaml)
+
+      expect(@keychain).to receive(:system).with("security import private -k #{File.expand_path('~')}/Library/Keychains/tug.keychain -T /usr/bin/codesign -P 'password'")
+      @keychain.import_private_key
+    end
+
+    it "should import the private key with a password via setter" do
+      @keychain = Tug::Keychain.keychain(@yaml)
+      @keychain.private_key_password = "hello"
+
+      expect(@keychain).to receive(:system).with("security import private -k #{File.expand_path('~')}/Library/Keychains/tug.keychain -T /usr/bin/codesign -P 'hello'")
+      @keychain.import_private_key
+    end
+  end
+
+  describe "when importing profiles" do
+  
+    before(:each) do
+      allow(FileUtils).to receive(:mkdir_p)
+    end
+
+    it "should create a profile folder" do
+      expect(FileUtils).to receive(:mkdir_p).with("#{File.expand_path('~')}/Library/MobileDevice/Provisioning\ Profiles/")
+      @keychain.import_profile
+    end
+
+    it "should import the dist profile" do
+      expect(@keychain).to receive(:system).with("cp path/to/profile #{File.expand_path('~')}/Library/MobileDevice/Provisioning\\ Profiles/")
+      @keychain.import_profile
+    end
+  end
+end

data/spec/output.txt

@@ -0,0 +1,2 @@
+Config file missing:
+  Try specifying a path to your config file with the --config option

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tug
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alex Fish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,10 +102,12 @@ files:
 - lib/tug/command/build_command.rb
 - lib/tug/command/command.rb
 - lib/tug/command/ipa_command.rb
+- lib/tug/command/provision_command.rb
 - lib/tug/config/.tug.yml
 - lib/tug/config/config_file.rb
 - lib/tug/config/missing_config_file.rb
 - lib/tug/interface/interface.rb
+- lib/tug/keychain/keychain.rb
 - lib/tug/project/project.rb
 - lib/tug/tool/xcode_build.rb
 - lib/tug/tool/xctool.rb
@@ -116,6 +118,7 @@ files:
 - spec/command_spec.rb
 - spec/config_file_spec.rb
 - spec/ipa_command_spec.rb
+- spec/keychain_spec.rb
 - spec/output.txt
 - spec/project_spec.rb
 - spec/spec_helper.rb
@@ -150,6 +153,7 @@ test_files:
 - spec/command_spec.rb
 - spec/config_file_spec.rb
 - spec/ipa_command_spec.rb
+- spec/keychain_spec.rb
 - spec/output.txt
 - spec/project_spec.rb
 - spec/spec_helper.rb