xcoder 0.1.14 → 0.1.15

data/lib/xcode/builder.rb

@@ -1,7 +1,7 @@
 require 'xcode/shell'
 require 'xcode/provisioning_profile'
 require 'xcode/test/parsers/ocunit_parser.rb'
-require 'xcode/testflight'
+require 'xcode/deploy/testflight'
 require 'xcode/builder/base_builder.rb'
 require 'xcode/builder/project_target_config_builder.rb'
 require 'xcode/builder/scheme_builder.rb'

data/lib/xcode/builder/base_builder.rb

@@ -78,11 +78,19 @@ module Xcode
         report
       end
 
+      #
+      # Upload to testflight
+      #
+      # The testflight object is yielded so further configuration can be performed before uploading
+      #
+      # @param api_token the API token for your testflight account
+      # @param team_token the token for the team you want to deploy to
+      #
       def testflight(api_token, team_token)
         raise "Can't find #{ipa_path}, do you need to call builder.package?" unless File.exists? ipa_path
-        raise "Can't fins #{dsym_zip_path}, do you need to call builder.package?" unless File.exists? dsym_zip_path
+        raise "Can't find #{dsym_zip_path}, do you need to call builder.package?" unless File.exists? dsym_zip_path
 
-        testflight = Xcode::Testflight.new(api_token, team_token)
+        testflight = Xcode::Deploy::Testflight.new(api_token, team_token)
         yield(testflight) if block_given?
         testflight.upload(ipa_path, dsym_zip_path)
       end

data/lib/xcode/deploy/testflight.rb

@@ -0,0 +1,60 @@
+require 'rest-client'
+require 'json'
+
+module Xcode
+  module Deploy
+    class Testflight
+      attr_accessor :api_token, :team_token, :notify, :proxy, :notes, :lists
+    
+      def initialize(api_token, team_token)
+        @api_token = api_token
+        @team_token = team_token
+        @notify = true
+        @notes = nil
+        @lists = []
+        @proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+      end
+    
+      def upload(ipa_path, dsymzip_path=nil)
+        puts "Uploading to Testflight..."
+      
+        # RestClient.proxy = @proxy || ENV['http_proxy'] || ENV['HTTP_PROXY']
+        # RestClient.log = '/tmp/restclient.log'
+        # 
+        # response = RestClient.post('http://testflightapp.com/api/builds.json',
+        #   :file => File.new(ipa_path),
+        #   :dsym => File.new(dsymzip_path),
+        #   :api_token => @api_token,
+        #   :team_token => @team_token,
+        #   :notes => @notes,
+        #   :notify => @notify ? 'True' : 'False',
+        #   :distribution_lists => @lists.join(',')
+        # )
+        # 
+        # json = JSON.parse(response)
+        # puts " + Done, got: #{json.inspect}"
+        # json
+      
+        cmd = Xcode::Shell::Command.new 'curl'
+        cmd << "--proxy #{@proxy}" unless @proxy.nil? or @proxy=='' 
+        cmd << "-X POST http://testflightapp.com/api/builds.json"
+        cmd << "-F file=@\"#{ipa_path}\""
+        cmd << "-F dsym=@\"#{dsymzip_path}\"" unless dsymzip_path.nil?
+        cmd << "-F api_token='#{@api_token}'"
+        cmd << "-F team_token='#{@team_token}'"
+        cmd << "-F notes=\"#{@notes}\"" unless @notes.nil?
+        cmd << "-F notify=#{@notify ? 'True' : 'False'}"
+        cmd << "-F distribution_lists='#{@lists.join(',')}'" unless @lists.count==0
+      
+        response = Xcode::Shell.execute(cmd)
+      
+        json = JSON.parse(response.join(''))
+        puts " + Done, got: #{json.inspect}"
+      
+        yield(json) if block_given?
+      
+        json
+      end
+    end
+  end
+end

data/lib/xcode/shell.rb

@@ -5,9 +5,9 @@ module Xcode
     
     class ExecutionError < StandardError; end
     
-    def self.execute(bits, show_output=true)
+    def self.execute(cmd, show_output=true)
       out = []
-      cmd = bits.is_a?(Xcode::Shell::Command) ? bits.to_s : bits
+      cmd = cmd.to_s
       
       puts "EXECUTE: #{cmd}"
       IO.popen (cmd) do |f| 

data/lib/xcode/shell/command.rb

@@ -3,7 +3,7 @@ require 'set'
 module Xcode
   module Shell
     class Command
-      attr_accessor :env
+      attr_accessor :env, :cmd, :args
 
       def initialize(cmd, environment={})
         @cmd = cmd

data/lib/xcode/version.rb

@@ -1,3 +1,3 @@
 module Xcode
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/spec/builder_spec.rb

@@ -46,30 +46,31 @@ describe Xcode::Builder do
     
     describe "#testflight" do
       
-      let(:testflight_parameters) do 
-        ['curl',
-        "--proxy http://proxyhost:8080",
-        "-X POST http://testflightapp.com/api/builds.json",
-        "-F file=@\"#{subject.ipa_path}\"",
-        "-F dsym=@\"#{subject.dsym_zip_path}\"",
-        "-F api_token='api_token'",
-        "-F team_token='team_token'",
-        "-F notes=\"some notes\"",
-        "-F notify=True",
-        "-F distribution_lists='List1,List2'"]
-      end
+      # let(:testflight_parameters) do 
+      #   ['curl',
+      #   "--proxy http://proxyhost:8080",
+      #   "-X POST http://testflightapp.com/api/builds.json",
+      #   "-F file=@\"#{subject.ipa_path}\"",
+      #   "-F dsym=@\"#{subject.dsym_zip_path}\"",
+      #   "-F api_token='api_token'",
+      #   "-F team_token='team_token'",
+      #   "-F notes=\"some notes\"",
+      #   "-F notify=True",
+      #   "-F distribution_lists='List1,List2'"]
+      # end
     
       it "should upload ipa and dsym to testflight" do 
         subject.build.package
         
-        Xcode::Shell.should_receive(:execute).with(testflight_parameters).and_return(['{}'])
-        subject.testflight("api_token", "team_token") do |tf|
+        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
       
+        result.should == 'result'
       end
     end
     

data/spec/deploy_testflight_spec.rb

@@ -0,0 +1,27 @@
+require_relative 'spec_helper'
+
+describe Xcode::Deploy::Testflight do
+  
+  let(:testflight) { Xcode::Deploy::Testflight.new 'api token', 'team token' }
+  
+  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
+    Xcode::Shell.should_receive(:execute) do |arg|
+      arg.is_a? Xcode::Shell::Command
+      arg.cmd.should == 'curl'
+      arg.args.should include('-F file=@"ipa path"')
+      arg.args.should include('-F dsym=@"dsym path"')
+      arg.args.should include("-F api_token='api token'")
+      arg.args.should include("-F team_token='team token'")
+      
+      ['{"response":"ok"}']
+    end
+    response = testflight.upload('ipa path', 'dsym path')
+    response['response'].should == 'ok'
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcoder
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000Z
+date: 2012-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70273992124040 !ruby/object:Gem::Requirement
+  requirement: &70353485685920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273992124040
+  version_requirements: *70353485685920
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70274003815880 !ruby/object:Gem::Requirement
+  requirement: &70353473165820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274003815880
+  version_requirements: *70353473165820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70274003815460 !ruby/object:Gem::Requirement
+  requirement: &70353473165400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274003815460
+  version_requirements: *70353473165400
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70274003815040 !ruby/object:Gem::Requirement
+  requirement: &70353473164980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274003815040
+  version_requirements: *70353473164980
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70274003814620 !ruby/object:Gem::Requirement
+  requirement: &70353473164560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274003814620
+  version_requirements: *70353473164560
 description: Provides a ruby based object-model for parsing project structures and
   invoking builds
 email:
@@ -105,6 +105,7 @@ files:
 - lib/xcode/core_ext/fixnum.rb
 - lib/xcode/core_ext/hash.rb
 - lib/xcode/core_ext/string.rb
+- lib/xcode/deploy/testflight.rb
 - lib/xcode/file_reference.rb
 - lib/xcode/group.rb
 - lib/xcode/info_plist.rb
@@ -127,7 +128,6 @@ files:
 - lib/xcode/test/report.rb
 - lib/xcode/test/report/suite_result.rb
 - lib/xcode/test/report/test_result.rb
-- lib/xcode/testflight.rb
 - lib/xcode/variant_group.rb
 - lib/xcode/version.rb
 - lib/xcode/workspace.rb
@@ -165,6 +165,7 @@ files:
 - spec/builder_spec.rb
 - spec/configuration_list_spec.rb
 - spec/configuration_spec.rb
+- spec/deploy_testflight_spec.rb
 - spec/group_spec.rb
 - spec/integration/builder_spec.rb
 - spec/integration/cedar_install_spec.rb
@@ -239,6 +240,7 @@ test_files:
 - spec/builder_spec.rb
 - spec/configuration_list_spec.rb
 - spec/configuration_spec.rb
+- spec/deploy_testflight_spec.rb
 - spec/group_spec.rb
 - spec/integration/builder_spec.rb
 - spec/integration/cedar_install_spec.rb

data/lib/xcode/testflight.rb

@@ -1,59 +0,0 @@
-require 'rest-client'
-require 'json'
-
-module Xcode
-  class Testflight
-    attr_accessor :api_token, :team_token, :notify, :proxy, :notes, :lists
-    
-    def initialize(api_token, team_token)
-      @api_token = api_token
-      @team_token = team_token
-      @notify = true
-      @notes = nil
-      @lists = []
-      @proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-    end
-    
-    def upload(ipa_path, dsymzip_path=nil)
-      puts "Uploading to Testflight..."
-      
-      # RestClient.proxy = @proxy || ENV['http_proxy'] || ENV['HTTP_PROXY']
-      # RestClient.log = '/tmp/restclient.log'
-      # 
-      # response = RestClient.post('http://testflightapp.com/api/builds.json',
-      #   :file => File.new(ipa_path),
-      #   :dsym => File.new(dsymzip_path),
-      #   :api_token => @api_token,
-      #   :team_token => @team_token,
-      #   :notes => @notes,
-      #   :notify => @notify ? 'True' : 'False',
-      #   :distribution_lists => @lists.join(',')
-      # )
-      # 
-      # json = JSON.parse(response)
-      # puts " + Done, got: #{json.inspect}"
-      # json
-      
-      cmd = []
-      cmd << 'curl'
-      cmd << "--proxy #{@proxy}" unless @proxy.nil? or @proxy=='' 
-      cmd << "-X POST http://testflightapp.com/api/builds.json"
-      cmd << "-F file=@\"#{ipa_path}\""
-      cmd << "-F dsym=@\"#{dsymzip_path}\"" unless dsymzip_path.nil?
-      cmd << "-F api_token='#{@api_token}'"
-      cmd << "-F team_token='#{@team_token}'"
-      cmd << "-F notes=\"#{@notes}\"" unless @notes.nil?
-      cmd << "-F notify=#{@notify ? 'True' : 'False'}"
-      cmd << "-F distribution_lists='#{@lists.join(',')}'" unless @lists.count==0
-      
-      response = Xcode::Shell.execute(cmd)
-      
-      json = JSON.parse(response.join(''))
-      puts " + Done, got: #{json.inspect}"
-      
-      yield(json) if block_given?
-      
-      json
-    end
-  end
-end