xcoder 0.1.15 → 0.1.18

data/spec/TestWorkspace.xcworkspace/contents.xcworkspacedata

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
+   <Group
+      location = "container:"
+      name = "Workspace Level Group">
+      <FileRef
+         location = "group:../README.md">
+      </FileRef>
+   </Group>
    <FileRef
       location = "group:TestProject/TestProject.xcodeproj">
    </FileRef>

data/spec/builder_spec.rb

@@ -1,7 +1,11 @@
 require_relative 'spec_helper'
 
-describe Xcode::Builder do 
-  
+RSpec.configure do |config|
+  config.mock_with :rspec
+end
+
+describe Xcode::Builder do
+
   context "when using a builder built from a configuration" do
 
     let(:configuration) { Xcode.project('TestProject').target('TestProject').config('Debug') }
@@ -9,44 +13,44 @@ describe Xcode::Builder do
     let(:subject) { configuration.builder }
 
     describe "#build" do
-      
-      let(:default_build_parameters) do        
+
+      let(:default_build_parameters) do
         cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-sdk #{configuration.target.project.sdk}"
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/\""
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/Products/\""
         cmd << "-project \"#{configuration.target.project.path}\""
-        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-target \"#{configuration.target.name}\""
         cmd << "-config \"#{configuration.name}\""
-        cmd << "-sdk #{configuration.target.project.sdk}"
-        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
-        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
         cmd
       end
-      
+
       let(:macosx_build_parameters) do
         cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-sdk macosx10.7"
         cmd << "-project \"#{configuration.target.project.path}\""
-        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-target \"#{configuration.target.name}\""
         cmd << "-config \"#{configuration.name}\""
-        cmd << "-sdk macosx10.7"
-        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
-        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/\""
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/Products/\""
         cmd
       end
 
       it "should build the project with the default parameters" do
-        Xcode::Shell.should_receive(:execute).with(default_build_parameters,true)
+        PTY.stub(:spawn).with(default_build_parameters.to_s)
         subject.build
       end
-      
+
       it "should allow the override of the sdk" do
-        Xcode::Shell.should_receive(:execute).with(macosx_build_parameters, true)
+        PTY.stub(:spawn).with(macosx_build_parameters.to_s)
         subject.build :sdk => 'macosx10.7'
       end
-      
+
     end
-    
+
     describe "#testflight" do
-      
-      # let(:testflight_parameters) do 
+
+      # let(:testflight_parameters) do
       #   ['curl',
       #   "--proxy http://proxyhost:8080",
       #   "-X POST http://testflightapp.com/api/builds.json",
@@ -58,144 +62,156 @@ describe Xcode::Builder do
       #   "-F notify=True",
       #   "-F distribution_lists='List1,List2'"]
       # end
-    
-      it "should upload ipa and dsym to testflight" do 
+
+      it "should upload ipa and dsym to testflight" do
         subject.build.package
-        
-        result = subject.testflight("api_token", "team_token") do |tf|
-          tf.should_receive(:upload).with(subject.ipa_path, subject.dsym_zip_path).and_return('result')
-          tf.proxy = "http://proxyhost:8080"
-          tf.notes = "some notes"
-          tf.lists << "List1"
-          tf.lists << "List2"
-        end
-      
+        testflight = nil
+        result = subject.deploy(:testflight, 
+          :api_token => "api_token",
+          :team_token => "team_token",
+          # :proxy => "http://proxyhost:8080",
+          :notes => "some notes",
+          :lists => ["List1", "List2"]) do |tf|  
+            testflight = tf       
+            tf.should_receive(:deploy).and_return('result')
+        end      
         result.should == 'result'
+        testflight.should_not==nil
+        testflight.api_token.should=="api_token"
+        testflight.team_token.should=="team_token"
+        testflight.builder.should==subject
+        testflight.lists.should==["List1", "List2"]
+        testflight.notes.should=="some notes"
       end
     end
-    
+
     describe "#test" do
-      
+
       let(:configuration) do
         Xcode.project('TestProject').target('LogicTests').config('Debug')
       end
-      
+
       let(:iphonesimulator_test_parameters) do
         cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-sdk iphonesimulator"
         cmd << "-project \"#{configuration.target.project.path}\""
-        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-target \"#{configuration.target.name}\""
         cmd << "-config \"#{configuration.name}\""
-        cmd << "-sdk iphonesimulator"
-        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
-        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/\""
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/Products/\""
         cmd.env["TEST_AFTER_BUILD"]="YES"
+        cmd.env["ONLY_ACTIVE_ARCH"]="NO"
         cmd
       end
-      
+
       let(:macosx_test_parameters) do
         cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-sdk macosx10.7"
         cmd << "-project \"#{configuration.target.project.path}\""
-        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-target \"#{configuration.target.name}\""
         cmd << "-config \"#{configuration.name}\""
-        cmd << "-sdk macosx10.7"
-        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
-        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/\""
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/Products/\""
         cmd.env["TEST_AFTER_BUILD"]="YES"
+        cmd.env["ONLY_ACTIVE_ARCH"]="NO"        
         cmd
       end
-      
-      
+
+
       it "should be able to run the test target on iphonesimulator" do
-        Xcode::Shell.should_receive(:execute).with(iphonesimulator_test_parameters, false)
+        PTY.stub(:spawn).with(iphonesimulator_test_parameters.to_s)
         subject.test :sdk => 'iphonesimulator'
       end
 
       it "should allow the override of the sdk" do
-        Xcode::Shell.should_receive(:execute).with(macosx_test_parameters, false)
+        PTY.stub(:spawn).with(macosx_test_parameters.to_s)
         subject.test :sdk => 'macosx10.7'
       end
-      
+
       it "should not exit when test failed" do
-        Xcode::Shell.stub(:execute)
+        PTY.stub(:spawn)
+        
         fake_parser = stub(:parser)
         fake_parser.stub(:failed? => true)
-        fake_parser.stub(:flush)
+        fake_parser.stub(:close)
         Xcode::Test::Parsers::OCUnitParser.stub(:new => fake_parser)
         subject.test
       end
-      
+
     end
 
     describe "#clean" do
 
       let(:default_clean_parameters) do
         cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-sdk iphoneos"
         cmd << "-project \"#{configuration.target.project.path}\""
-        cmd << "-target \"#{configuration.target.name}\"" 
+        cmd << "-target \"#{configuration.target.name}\""
         cmd << "-config \"#{configuration.name}\""
-        cmd << "-sdk iphoneos"
         cmd << "clean"
-        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
-        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/build/\"" 
+        cmd.env["OBJROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/\""
+        cmd.env["SYMROOT"]="\"#{File.dirname(configuration.target.project.path)}/Build/Products/\""
         cmd
       end
 
 
       it "should clean the project with the default parameter" do
-        Xcode::Shell.should_receive(:execute).with(default_clean_parameters, true)
+        PTY.stub(:spawn).with(default_clean_parameters.to_s)
         subject.clean
       end
 
     end
 
   end
-  
+
   context "when using a builder built from a scheme" do
 
     let(:scheme) { Xcode.project('TestProject').scheme('TestProject') }
-    
+
     let(:subject) { scheme.builder }
 
     describe "#build" do
-      
+
       let(:default_build_parameters) do
         cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-sdk iphoneos"
         cmd << "-project \"#{scheme.build_targets.last.project.path}\""
         cmd << "-scheme \"#{scheme.name}\""
-        cmd << "-sdk iphoneos"
-        cmd.env["OBJROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/build/\"" 
-        cmd.env["SYMROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/build/\"" 
+        cmd << "-configuration \"Release\""
+        cmd.env["OBJROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/Build/\""
+        cmd.env["SYMROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/Build/Products/\""
         cmd
       end
 
       it "should build the project with the default parameters" do
-        Xcode::Shell.should_receive(:execute).with(default_build_parameters, true)
+        PTY.stub(:spawn).with(default_build_parameters.to_s)
         subject.build
       end
-      
+
     end
-    
+
     describe "#clean" do
 
       let(:default_clean_parameters) do
         cmd = Xcode::Shell::Command.new "xcodebuild"
+        cmd << "-sdk iphoneos"
         cmd << "-project \"#{scheme.build_targets.last.project.path}\""
         cmd << "-scheme \"#{scheme.name}\""
-        cmd << "-sdk iphoneos"
+        cmd << "-configuration \"Release\""
         cmd << "clean"
-        cmd.env["OBJROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/build/\"" 
-        cmd.env["SYMROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/build/\""
+        cmd.env["OBJROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/Build/\""
+        cmd.env["SYMROOT"]="\"#{File.dirname(scheme.build_targets.last.project.path)}/Build/Products/\""
         cmd
       end
 
 
       it "should clean the project with the default parameter" do
-        Xcode::Shell.should_receive(:execute).with(default_clean_parameters, true)
+        PTY.stub(:spawn).with(default_clean_parameters.to_s)
         subject.clean
       end
 
     end
 
   end
-  
-end
+
+end

data/spec/deploy_spec.rb

@@ -0,0 +1,63 @@
+require_relative 'spec_helper'
+require 'ostruct'
+require 'xcode/deploy/testflight'
+require 'xcode/deploy/web_assets'
+require 'xcode/deploy/ftp'
+require 'xcode/deploy/ssh'
+
+describe Xcode::Deploy do
+
+  let :builder do
+    OpenStruct.new(
+      :ipa_path => 'ipa path', 
+      :dsym_zip_path => 'dsym path',
+      :bundle_version => '1.0',
+      :bundle_identifier => 'test.bunlde.identifier'
+    )
+  end
+
+  describe Xcode::Deploy::WebAssets do 
+    it "should generate the assets" do
+      Xcode::Deploy::WebAssets.generate builder, 'http://example.com/base-url' do |dir|
+        File.exists?("#{dir}/index.html").should == true
+        File.exists?("#{dir}/manifest.plist").should == true
+
+        # TODO: more tests
+      end
+    end
+  end
+
+  describe Xcode::Deploy::Ftp do 
+    # TODO: tests!
+  end
+
+  describe Xcode::Deploy::Ssh do 
+    # TODO: tests!
+  end
+  
+  describe Xcode::Deploy::Testflight do
+
+    let(:testflight) do 
+      Xcode::Deploy::Testflight.new(builder, {:api_token => 'api token', :team_token => 'team token' }) 
+    end
+    
+    it "should be configured with api and team token" do
+      testflight.api_token.should == 'api token'
+      testflight.team_token.should == 'team token'
+    end
+    
+    it "should call curl with correct bulld paths" do
+      PTY.stub(:spawn).with do |cmd, &block|
+        cmd.should =~/^curl/
+        cmd.should =~/-F file=@"ipa path"/
+        cmd.should =~/-F dsym=@"dsym path"/
+        cmd.should =~/-F api_token='api token'/
+        cmd.should =~/-F team_token='team token'/                
+      end
+
+      testflight.deploy
+      # response['response'].should == 'ok'
+    end
+  end
+
+end

data/spec/ocunit_parser_spec.rb

@@ -119,7 +119,7 @@ describe Xcode::Test::Parsers::OCUnitParser do
     parser << "/Developer/Tools/RunPlatformUnitTests.include: line 415: 32225 Bus error: 10           \"${THIN_TEST_RIG}\" \"${OTHER_TEST_FLAGS}\" \"${TEST_BUNDLE_PATH}\""
     parser << "/Developer/Tools/RunPlatformUnitTests.include:451: error: Test rig '/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk/Developer/usr/bin/otest' exited abnormally with code 138 (it may have crashed)."
   
-    parser.flush
+    parser.close
     
     report = parser.report
     

data/xcoder.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "multi_json"
   s.add_runtime_dependency "plist"  
   s.add_runtime_dependency "nokogiri"
   s.add_runtime_dependency "builder"
   s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "colorize"
+  s.add_runtime_dependency "aws-sdk"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcoder
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.18
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70353485685920 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353485685920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70353473165820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353473165820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70353473165400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353473165400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70353473164980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353473164980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70353473164560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,29 +86,70 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353473164560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a ruby based object-model for parsing project structures and
   invoking builds
 email:
 - ray@wirestorm.net
 - franklin.webber@gmail.com
-executables: []
+executables:
+- xcoder
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rbenv-version
 - .rvmrc
 - Gemfile
 - Guardfile
 - README.md
 - Rakefile
+- bin/xcoder
 - lib/xcode/build_file.rb
 - lib/xcode/build_phase.rb
 - lib/xcode/builder.rb
 - lib/xcode/builder/base_builder.rb
+- lib/xcode/builder/build_parser.rb
 - lib/xcode/builder/project_target_config_builder.rb
 - lib/xcode/builder/scheme_builder.rb
-- lib/xcode/buildfile.rb
+- lib/xcode/buildspec.rb
 - lib/xcode/configuration.rb
 - lib/xcode/configuration_list.rb
 - lib/xcode/configuration_owner.rb
@@ -105,25 +166,34 @@ files:
 - lib/xcode/core_ext/fixnum.rb
 - lib/xcode/core_ext/hash.rb
 - lib/xcode/core_ext/string.rb
+- lib/xcode/deploy/ftp.rb
+- lib/xcode/deploy/kickfolio.rb
+- lib/xcode/deploy/s3.rb
+- lib/xcode/deploy/ssh.rb
+- lib/xcode/deploy/templates/index.rhtml
+- lib/xcode/deploy/templates/manifest.rhtml
 - lib/xcode/deploy/testflight.rb
+- lib/xcode/deploy/web_assets.rb
 - lib/xcode/file_reference.rb
 - lib/xcode/group.rb
 - lib/xcode/info_plist.rb
 - lib/xcode/keychain.rb
 - lib/xcode/parsers/plutil_project_parser.rb
+- lib/xcode/platform.rb
 - lib/xcode/project.rb
 - lib/xcode/project_reference.rb
 - lib/xcode/provisioning_profile.rb
 - lib/xcode/registry.rb
 - lib/xcode/resource.rb
 - lib/xcode/scheme.rb
-- lib/xcode/shell.rb
 - lib/xcode/shell/command.rb
 - lib/xcode/simple_identifier_generator.rb
 - lib/xcode/target.rb
 - lib/xcode/target_dependency.rb
+- lib/xcode/terminal_output.rb
 - lib/xcode/test/formatters/junit_formatter.rb
 - lib/xcode/test/formatters/stdout_formatter.rb
+- lib/xcode/test/parsers/kif_parser.rb
 - lib/xcode/test/parsers/ocunit_parser.rb
 - lib/xcode/test/report.rb
 - lib/xcode/test/report/suite_result.rb
@@ -165,7 +235,7 @@ files:
 - spec/builder_spec.rb
 - spec/configuration_list_spec.rb
 - spec/configuration_spec.rb
-- spec/deploy_testflight_spec.rb
+- spec/deploy_spec.rb
 - spec/group_spec.rb
 - spec/integration/builder_spec.rb
 - spec/integration/cedar_install_spec.rb
@@ -196,15 +266,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -338592887779862052
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -338592887779862052
 requirements: []
 rubyforge_project: xcoder
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper around xcodebuild, xcrun, agvtool and pbxproj files
@@ -240,7 +316,7 @@ test_files:
 - spec/builder_spec.rb
 - spec/configuration_list_spec.rb
 - spec/configuration_spec.rb
-- spec/deploy_testflight_spec.rb
+- spec/deploy_spec.rb
 - spec/group_spec.rb
 - spec/integration/builder_spec.rb
 - spec/integration/cedar_install_spec.rb