tug 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9710a9c58ba0148c3f554af14898d4de0b966091
-  data.tar.gz: 35c8f0df420da37a7e73253e8c4df76aa38e82ff
+  metadata.gz: 08744a632238e996beb4a29db85fa89e7ee20faf
+  data.tar.gz: bc0865da0127107943b503ae3fc0a47fd9dbc649
 SHA512:
-  metadata.gz: baa1543c98c85d75f0f7cab80bcf1ab80afc9929e196e30213396f6f3467bb48c6a4ec17c2cac48c988546ff67ec04bbbaccd0a8f30e058637efd18baff8a527
-  data.tar.gz: b585022d3be40b825802081c9127ca4feffc9c4e198c357f4d0fa0ecfb48048f0157f1f8769c60c165cd0d0affc7007acc8aa332f2e33d6b5cb8e40af9456ce4
+  metadata.gz: 5487f7da527020af59fbde33153f96fe9db0b0f7fe91c764ccb6ed590e3306c9c771916f60abcf460a7ad70d61bd86d46804b524535e6306f7d1fbb780d05b4d
+  data.tar.gz: 55f6d92f1d195674df38b819a81220bf9881303b248572c4310467e277c43cee02888cd141c33c358f24549fc484275f8f34f028dbd326f124c88d30d08bf1f7

data/README.md

@@ -25,7 +25,11 @@ Or install it yourself as:
 
 ### Build
 
-Run `tug build` from your Xcode projects root directory.
+Run `tug build` from your Xcode projects root directory. Each scheme in the scheme config array will be built.
+
+### IPA
+
+Run `tug ipa` from your Xcode projects root directory, see the example config below for details on how to set a configuration and profile name. An ipa will be generated for each scheme in the config's scheme array.
 
 ### Config
 
@@ -35,9 +39,10 @@ A sample config file:
 
 ```
 project:
-  workspace: tug.xcworkspace
-  schemes:
+  workspace: tug.xcworkspace     # Path to the project workspace
+  schemes:                       # An array of schemes to build
     - tug
+  ipa_config: Release            # The configuration to use to build ipas
 ```
 
 ## Contributing

data/lib/tug/command/build_command.rb

@@ -1,10 +1,10 @@
 module Tug
   class BuildCommand < Command
 
-    def execute(project)
-      project.schemes.each do |scheme|
-        system("xctool -workspace #{project.workspace} -scheme #{scheme} -sdk iphonesimulator")
-      end
+    private
+
+    def xctool(config)
+      xctool = Tug::XCTool.tool_for_config("Debug")
     end
   end
 end

data/lib/tug/command/command.rb

@@ -6,6 +6,8 @@ module Tug
         case command_string
         when "build"
           Tug::BuildCommand.new
+        when "ipa"
+          Tug::IpaCommand.new
         else
           Tug::Command.new
         end
@@ -13,6 +15,16 @@ module Tug
     end
 
     def execute(project)
+      @xctool = xctool(project.ipa_config)
+      project.schemes.each do |scheme|
+        @xctool.build(project.workspace, scheme)
+      end
+    end
+
+    private
+
+    def xctool(config)
+      xctool = Tug::XCTool.tool_for_config(config)
     end
   end
 end

data/lib/tug/command/ipa_command.rb

@@ -0,0 +1,25 @@
+module Tug
+  class IpaCommand < Command
+
+    def execute(project)
+      super
+      export_ipa(project)
+      move_ipa(project)
+    end
+
+    private
+
+    def export_ipa(project)
+      xcodebuild = Tug::XcodeBuild.new
+      project.schemes.each do |scheme|
+        xcodebuild.export_ipa(scheme)
+      end
+    end
+
+    def move_ipa(project)
+      project.schemes.each do |scheme|
+        FileUtils.mv "/tmp/#{scheme}.ipa", "#{project.ipa_export_path}/#{scheme}.ipa"
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 project:
   workspace: tug.xcworkspace
   schemes:
-    - tug
+    - tug
+  ipa_config: InHouse

data/lib/tug/config/config_file.rb

@@ -4,27 +4,24 @@ module Tug
     attr_reader :project
 
     class << self
-      def config_file(path=nil)
+      def config_file(path=default_path)
         if path and File.file?(path)
-          Tug::ExternalConfigFile.new(path)
-        elsif File.file?(File.join(Dir.pwd, '.tug.yml'))
-          Tug::ConfigFile.new
+          Tug::ConfigFile.new(path)
         else
           Tug::MissingConfigFile.new
         end
       end
     end
 
-    def initialize(path=nil)
-      config = YAML::load_file(File.join(Dir.pwd, '.tug.yml'))
-      @project = project_from_config(config)
+    def initialize(path)
+      config = YAML::load_file(path)
+      @project = Tug::Project.new(config['project'])
     end
 
     private
 
-    def project_from_config(config)
-      project_yaml = config['project']
-      Tug::Project.new(project_yaml['workspace'], project_yaml['schemes'])
+    def default_path
+      File.join(Dir.pwd, '.tug.yml')
     end
   end
 end

data/lib/tug/interface/interface.rb

@@ -2,12 +2,22 @@ module Tug
   class Interface < Thor
 
     desc "build", "build a project"
-    option :config
+    option :config, :default => "#{Dir.pwd}/.tug.yml"
     def build
       config_file = Tug::ConfigFile.config_file(options[:config])
       execute(__method__.to_s, config_file.project)
     end
 
+    desc "ipa", "generate an ipa"
+    option :config, :default => "#{Dir.pwd}/.tug.yml"
+    option :export, :default => "#{Dir.pwd}"
+    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)
+    end
+
     no_commands do
       def execute(command, project)
         command = Tug::Command.command_for_string(command)

data/lib/tug/project/project.rb

@@ -1,12 +1,16 @@
 module Tug
   class Project
 
-    attr_reader :schemes
-    attr_reader :workspace
+    attr_reader   :schemes
+    attr_reader   :workspace
+    attr_reader   :ipa_config
+    attr_accessor :ipa_export_path
 
-    def initialize(workspace, schemes)
-      @schemes = schemes
-      @workspace = workspace
+    def initialize(project_yaml)
+      @schemes          = project_yaml['schemes']
+      @workspace        = project_yaml['workspace']
+      @ipa_config       = project_yaml['ipa_config']
+      @ipa_export_path  = Dir.pwd
     end
   end
 end

data/lib/tug/tool/xcode_build.rb

@@ -0,0 +1,22 @@
+module Tug
+  class XcodeBuild
+
+    def export_ipa(name)
+      system("xcodebuild #{archive_options(name)} #{export_options(name)} #{profile_options}")
+    end
+
+    private
+
+    def profile_options
+      "-exportWithOriginalSigningIdentity"
+    end
+
+    def export_options(name)
+      "-exportPath /tmp/#{name}.ipa -exportFormat ipa -exportArchive"
+    end
+
+    def archive_options(name)
+      "-archivePath /tmp/#{name}.xcarchive"
+    end
+  end
+end

data/lib/tug/tool/xctool.rb

@@ -0,0 +1,31 @@
+module Tug
+  class XCTool
+
+    attr_reader :config
+
+    class << self
+      def tool_for_config(config)
+        case config.downcase
+        when "inhouse", "release"
+          Tug::XCToolArchive.new(config)
+        else
+          Tug::XCToolBuild.new(config)
+        end
+      end
+    end
+
+    def initialize(config)
+      @config = config
+    end
+
+    def build(workspace, scheme)
+      system("xctool #{build_options(workspace, scheme)}")
+    end
+
+    private
+
+    def build_options(workspace, scheme)
+      "-workspace #{workspace} -scheme #{scheme} -configuration #{config}"
+    end
+  end
+end

data/lib/tug/tool/xctool_archive.rb

@@ -0,0 +1,10 @@
+module Tug
+  class XCToolArchive < XCTool
+
+    private
+
+    def build_options(workspace, scheme)
+      super + " archive -archivePath /tmp/#{scheme}.xcarchive"
+    end
+  end
+end

data/lib/tug/tool/xctool_build.rb

@@ -0,0 +1,10 @@
+module Tug
+  class XCToolBuild < XCTool
+
+    private
+
+    def build_options(workspace, scheme)
+      super + " -sdk iphonesimulator"
+    end
+  end
+end

data/lib/tug/version.rb

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

data/lib/tug.rb

@@ -6,11 +6,16 @@ require "tug/version"
 
 require "tug/command/command"
 require "tug/command/build_command"
+require "tug/command/ipa_command"
 
 require "tug/interface/interface"
 
 require "tug/config/config_file"
 require "tug/config/missing_config_file"
-require "tug/config/external_config_file"
 
-require "tug/project/project"
+require "tug/project/project"
+
+require "tug/tool/xcode_build"
+require "tug/tool/xctool"
+require "tug/tool/xctool_build"
+require "tug/tool/xctool_archive"

data/spec/build_command_spec.rb

@@ -5,23 +5,14 @@ describe Tug::BuildCommand do
   describe "when executing" do
 
     before(:each) do
-      @build_command = Tug::BuildCommand.new
-      @project = Tug::Project.new('workspace', ['scheme'])
+      @command = Tug::BuildCommand.new
+      allow(@command).to receive(:system)
+      @project = Tug::Project.new(project_yaml)
     end
 
-    it "should run xctool" do
-      expect(@build_command).to receive(:system).with(/xctool/)
-      @build_command.execute(@project)
-    end
-
-    it "should set the workspace" do
-      expect(@build_command).to receive(:system).with(/-workspace workspace/)
-      @build_command.execute(@project)
-    end
-
-    it "should set the scheme" do
-      expect(@build_command).to receive(:system).with(/-scheme scheme/)
-      @build_command.execute(@project)
+    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)
     end
   end
 end

data/spec/command_spec.rb

@@ -12,6 +12,11 @@ describe Tug::Command do
       expect(command).to be_kind_of(Tug::BuildCommand)
     end
 
+    it "should return an ipa command" do
+      command = Tug::Command.command_for_string("ipa")
+      expect(command).to be_kind_of(Tug::IpaCommand)
+    end
+
     it "should return a default command" do
       command = Tug::Command.command_for_string("hello")
       expect(command).to be_kind_of(Tug::Command)

data/spec/config_file_spec.rb

@@ -3,29 +3,23 @@ require "spec_helper"
 describe Tug::ConfigFile do
 
   before(:each) do
-    config = {'project' => {'workspace' => 'hello', 'schemes' => ["world"]}}
+    config = {'project' => {'workspace' => 'hello', 'schemes' => ["world"], 'ipa_config' => 'config'}}
     allow(YAML).to receive(:load_file).and_return(config)
-    @config_file = Tug::ConfigFile.new
+    @config_file = Tug::ConfigFile.new("path")
   end
 
   describe "when returning a config file" do
-    it "should return a config file for no path" do
+    it "should return a config file for a path" do
       expect(File).to receive(:file?).and_return(true)
-      config_file = Tug::ConfigFile.config_file
+      config_file = Tug::ConfigFile.config_file("path")
       expect(config_file).to be_kind_of(Tug::ConfigFile)
     end
 
     it "should return a missing config file for no file found" do
       allow_any_instance_of(Tug::MissingConfigFile).to receive(:abort)
       expect(File).to receive(:file?).and_return(false)
-      config_file = Tug::ConfigFile.config_file
-      expect(config_file).to be_kind_of(Tug::MissingConfigFile)
-    end
-
-    it "should return an external config file for a path" do
-      allow(File).to receive(:file?).and_return(true)
       config_file = Tug::ConfigFile.config_file("path")
-      expect(config_file).to be_kind_of(Tug::ExternalConfigFile)
+      expect(config_file).to be_kind_of(Tug::MissingConfigFile)
     end
   end
 

data/spec/ipa_command_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Tug::IpaCommand do
+
+  describe "when executing" do
+    before(:each) do
+      @command = Tug::IpaCommand.new
+      allow_any_instance_of(Tug::XcodeBuild).to receive(:system)
+      allow_any_instance_of(Tug::XCTool).to receive(:system)
+      allow(FileUtils).to receive(:mv)
+
+      yaml = project_yaml
+      yaml["ipa_config"] = "InHouse"
+      @project = Tug::Project.new(yaml)
+    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)
+    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)
+    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)
+    end
+  end
+end

data/spec/output.txt

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

data/spec/project_spec.rb

@@ -5,7 +5,7 @@ describe Tug::Project do
   describe "when created" do
 
     before(:each) do
-      @project = Tug::Project.new("workspace", ["scheme"])
+      @project = Tug::Project.new(project_yaml)
     end
 
     it "should have a workspace" do
@@ -15,5 +15,13 @@ describe Tug::Project do
     it "should have a scheme" do
       expect(@project.schemes).to include("scheme")
     end
+
+    it "should have an ipa config" do
+      expect(@project.ipa_config).to match("config")
+    end
+
+    it "should have an ipa export path" do
+      expect(@project.ipa_export_path).to be
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,18 @@
 require "tug"
 
+module Helpers
+  def project_yaml
+    {"workspace" => "workspace",
+      "schemes" => ["scheme"],
+      "ipa_config" => "config",
+      "ipa_profile" => "profile"}
+  end
+end
+
 RSpec.configure do |config|
   config.before(:suite) do
     $stderr = File.new(File.join(File.dirname(__FILE__), 'output.txt'), 'w')
     $stdout = File.new(File.join(File.dirname(__FILE__), 'output.txt'), 'w')
   end
+  config.include Helpers
 end

data/spec/xctool_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Tug::XCTool do
+  describe "when returning an xctool" do
+    it "should return a build tool" do
+      xctool = Tug::XCTool.tool_for_config("Debug")
+      expect(xctool).to be_kind_of(Tug::XCToolBuild)
+    end
+
+    it "should return an archive tool" do
+      xctool = Tug::XCTool.tool_for_config("InHouse")
+      expect(xctool).to be_kind_of(Tug::XCToolArchive)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tug
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alex Fish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -101,19 +101,25 @@ files:
 - lib/tug.rb
 - lib/tug/command/build_command.rb
 - lib/tug/command/command.rb
+- lib/tug/command/ipa_command.rb
 - lib/tug/config/.tug.yml
 - lib/tug/config/config_file.rb
-- lib/tug/config/external_config_file.rb
 - lib/tug/config/missing_config_file.rb
 - lib/tug/interface/interface.rb
 - lib/tug/project/project.rb
+- lib/tug/tool/xcode_build.rb
+- lib/tug/tool/xctool.rb
+- lib/tug/tool/xctool_archive.rb
+- lib/tug/tool/xctool_build.rb
 - lib/tug/version.rb
 - spec/build_command_spec.rb
 - spec/command_spec.rb
 - spec/config_file_spec.rb
+- spec/ipa_command_spec.rb
 - spec/output.txt
 - spec/project_spec.rb
 - spec/spec_helper.rb
+- spec/xctool_spec.rb
 - tug.gemspec
 homepage: https://github.com/alexfish/tug
 licenses:
@@ -135,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: iOS project builder and depoloyer
@@ -143,6 +149,8 @@ test_files:
 - spec/build_command_spec.rb
 - spec/command_spec.rb
 - spec/config_file_spec.rb
+- spec/ipa_command_spec.rb
 - spec/output.txt
 - spec/project_spec.rb
 - spec/spec_helper.rb
+- spec/xctool_spec.rb

data/lib/tug/config/external_config_file.rb

@@ -1,8 +0,0 @@
-module Tug
-  class ExternalConfigFile < ConfigFile
-
-    def initialize(path=nil)
-      @config = YAML::load_file(path)
-    end
-  end
-end