yolo 1.1.16 → 1.1.17

data/lib/yolo/deployment/ota.rb

@@ -60,7 +60,7 @@ module Yolo
             while line = io.readline
               response << line
             end
-          rescue EOFError
+          rescue StandardError
             @error_formatter.deploy_failed("Upload error")
           end
         end

data/lib/yolo/deployment/test_flight.rb

@@ -23,17 +23,13 @@ module Yolo
         IO.popen(curl_string(package_path, opts)) do |io|
           begin
             while line = io.readline
-              begin
-                response << line
-              rescue StandardError => e
-                 @error_formatter.deploy_failed("ParserError: #{e}")
-              end
+              response << line
             end
-          rescue EOFError
-            #@error_formatter.deploy_failed("ParserError")
-           end
+          rescue StandardError
+            @error_formatter.deploy_failed("Upload error")
+          end
         end
-        upload_complete(response)
+        upload_complete(response) if response.length > 0
       end
 
       private

data/lib/yolo/notify/ios/email.html

@@ -253,7 +253,10 @@
       * @section button style
       * @tip Set the styling for your email's button. Choose a style that draws attention.
       */
-      .templateButtonContent, .templateButtonContent a:link, .templateButtonContent a:visited, /* Yahoo! Mail Override */ .templateButtonContent a .yshortcuts /* Yahoo! Mail Override */{
+      .templateButtonContent {
+        padding: 0; /* Override standard td element styles */
+      }
+      .templateButtonContent a:link, .templateButtonContent a:visited, /* Yahoo! Mail Override */ .templateButtonContent a .yshortcuts /* Yahoo! Mail Override */{
         /*@editable*/ color:#FFFFFF;
         /*@editable*/ font-family:Helvetica;
         /*@editable*/ font-size:18px;
@@ -261,6 +264,9 @@
         /*@editable*/ line-height:100%;
         text-align:center;
         text-decoration:none;
+        display: inline-block;
+        width: 100%;
+        padding: 20px 0;
       }
 
       .bodyContent img{

data/lib/yolo/notify/ios/ota_email.rb

@@ -17,7 +17,6 @@ module Yolo
         #
         def body(opts)
           message = <<MESSAGE_END
-To: A Test User <test@todomain.com>
 MIME-Version: 1.0
 Content-type: text/html
 Subject: #{opts[:subject]}

data/lib/yolo/tasks/ios/build.rb

@@ -19,7 +19,7 @@ module Yolo
         def build_opts_string(*additional_opts)
           options = build_opts + additional_opts
           if configuration == "Debug" or configuration.nil?
-            options = options << "CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO"
+            options = options << "CODE_SIGN_IDENTITY='' CODE_SIGNING_REQUIRED=NO"
           end
           return options.compact.join(" ")
         end

data/lib/yolo/tasks/ios/coverage.rb

@@ -17,7 +17,7 @@ module Yolo
         end
 
         #
-        # Uses Xcode to find the full path to generated app file
+        # Uses Xcode to find the full path to the build objects
         #
         # @return [String] the path to the generated .app file
         def build_path
@@ -26,7 +26,7 @@ module Yolo
             files << path if path =~ /.*#{name}-.*\/Build\/Intermediates\/#{name}.build\/.*-iphonesimulator\/#{name}.build\/Objects-normal/
           end
           latest = files.sort_by { |filename| File.mtime(filename)}.last # get the latest
-          latest.split("/")[0..-2].join("/") # remove the file and get the dir
+          latest.split("/")[0..-2].join("/") if latest # remove the file and get the dir
         end
 
         #

data/lib/yolo/tools/ios/calabash.rb

@@ -19,14 +19,10 @@ module Yolo
           IO.popen("cucumber --format #{format.to_s} --out #{output_dir}") do |io|
             begin
               while line = io.readline
-                begin
-                  puts line
-                rescue StandardError => e
-                  puts "Error from output buffer: #{e.inspect}"
-                  puts e.backtrace
-                end
+                puts line
               end
             rescue EOFError
+              puts "Error while executing"
             end
           end
           $?.exitstatus if $?

data/spec/deployment/ota_spec.rb

@@ -18,7 +18,6 @@ describe Yolo::Deployment::OTA do
   end
 
   describe "when deploying" do
-
     before do
       @ota.stub(:upload)
     end
@@ -67,8 +66,8 @@ describe Yolo::Deployment::OTA do
       @ota.upload
     end
 
-    it "should catch EOFError exceptions" do
-      @io.stub(:readline).and_raise(EOFError)
+    it "should catch StandardError exceptions" do
+      @io.stub(:readline).and_raise(StandardError)
       @error_formatter.should_receive(:deploy_failed).at_least(1).times
       @ota.upload
     end
@@ -85,11 +84,9 @@ describe Yolo::Deployment::OTA do
     end
   end
 
-  describe "on completion" do
-
+  describe "when upload completes" do
     before do
       @ota.stub(:upload)
-      @json = "{'link':'test_link','password','test_password'}"
     end
 
     it "should catch json parse errors" do
@@ -98,12 +95,11 @@ describe Yolo::Deployment::OTA do
     end
 
     it "should parse the response" do
-      @ota.upload_complete(@json)
       @ota.deploy("test", nil) do |url, password|
         password.should eq("test_password")
         url.should eq("test_link")
       end
+      @ota.upload_complete('{"link":"test_link","password":"test_password"}')
     end
-
   end
 end

data/spec/deployment/test_flight_spec.rb

@@ -1,8 +1,158 @@
 require 'spec_helper'
 require 'yolo/deployment'
 require 'yolo/formatters'
+require "yolo/tools/ios/release_notes"
+require 'yolo/config'
 
 describe Yolo::Deployment::TestFlight do
-  pending "all tests" do
+
+   before do
+    @error_formatter = Yolo::Formatters::ErrorFormatter.new
+    Yolo::Formatters::ErrorFormatter.stub(:new){@error_formatter}
+    @error_formatter.stub(:deploy_failed)
+    Yolo::Formatters::ErrorFormatter.any_instance.stub(:puts)
+    Yolo::Formatters::ProgressFormatter.any_instance.stub(:puts)
+    Yolo::Formatters::ProgressFormatter.any_instance.stub(:deploying_ipa)
+    Yolo::Tools::Ios::ReleaseNotes.stub(:plaintext)
+    @tf = Yolo::Deployment::TestFlight.new
+    @tf.instance_variable_set(:@error_formatter, @error_formatter)
+  end
+
+  describe "when deploying" do
+    before do
+      @tf.stub(:curl_string){"curlstring"}
+      @tf.stub(:upload_complete)
+      @io = mock(IO)
+      @io.stub(:readline)
+      IO.stub(:popen).and_yield(@io)
+    end
+
+    it "should execute a curl string" do
+      IO.should_receive(:popen).with("curlstring")
+      @tf.deploy("test")
+    end
+
+    it "should catch StandardError exceptions" do
+      @io.stub(:readline).and_raise(StandardError)
+      @error_formatter.should_receive(:deploy_failed).at_least(1).times
+      @tf.deploy("test")
+    end
+
+    it "should parse the response" do
+      @io.stub(:readline).and_return("response string", nil)
+      @tf.should_receive(:upload_complete).with("response string")
+      @tf.deploy("test")
+    end
+
+    it "should not complete with a nil response" do
+      @io.should_not_receive(:upload_complete)
+      @tf.deploy("test")
+    end
+  end
+
+  describe "when parsing options" do
+    it "should parse the distribution lists" do
+      @tf.instance_eval{distribution_lists({:distribution_lists => ["test", "test"]})}.should eq("test,test")
+    end
+
+    it "should parse the notify option" do
+      @tf.instance_eval{notify({:notify => true})}.should eq("True")
+    end
+  end
+
+  describe "when loading settings" do
+    it "should load the api token" do
+      Yolo::Config::Settings.instance.stub(:api_token){"apitoken"}
+      @tf.instance_eval{api_token}.should eq("apitoken")
+    end
+
+    it "should load the team token" do
+      Yolo::Config::Settings.instance.stub(:team_token){"teamtoken"}
+      @tf.instance_eval{team_token}.should eq("teamtoken")
+    end
+  end
+
+  describe "when loading notes" do
+    it "should set default notes" do
+      @tf.instance_eval{notes}.should eq("No notes provided")
+    end
+
+    it "should load notes from release notes" do
+      Yolo::Tools::Ios::ReleaseNotes.stub(:plaintext){"test notes"}
+      @tf.instance_eval{notes}.should eq("test notes")
+    end
+  end
+
+  describe "when the upload completes" do
+    before do
+      @io = mock(IO)
+      IO.stub(:popen).and_yield(@io)
+    end
+
+    it "should catch json parse errors" do
+      @error_formatter.should_receive(:deploy_failed)
+      @tf.instance_eval{upload_complete("json")}
+    end
+
+    it "should parse the response" do
+      @io.stub(:readline).and_return('{"install_url":"test_link"}', nil)
+      @tf.deploy("test", nil) do |url, password|
+        url.should eq("test_link")
+      end
+    end
+  end
+
+  describe "when building a curl string" do
+    before do
+      @tf.stub(:api_token){"apitoken"}
+      @tf.stub(:team_token){"teamtoken"}
+      @tf.stub(:notes){"notes"}
+      @tf.stub(:notify){"notify"}
+      @tf.stub(:distribution_lists){"list"}
+    end
+
+    it "should use curl" do
+      @tf.instance_eval{curl_string("test", nil)}.should match(/curl/)
+    end
+
+    it "should set the correct URL" do
+      @tf.instance_eval{curl_string("test", nil)}.should match(/http:\/\/testflightapp.com\/api\/builds.json/)
+    end
+
+    it "should be a post request" do
+      @tf.instance_eval{curl_string("test", nil)}.should match(/-X POST -#/)
+    end
+
+    it "should set the file path" do
+      @tf.instance_eval{curl_string("test", nil)}.should match(/-F file=@test/)
+    end
+
+    it "should set the api token" do
+      @tf.instance_eval{curl_string("test", nil)}.should match(/-F api_token='apitoken'/)
+    end
+
+    it "should set the team token" do
+      @tf.instance_eval{curl_string("test", nil)}.should match(/-F team_token='teamtoken'/)
+    end
+
+    it "should set the notes" do
+      @tf.instance_eval{curl_string("test", nil)}.should match(/-F notes='notes'/)
+    end
+
+    it "should set the notify string" do
+      @tf.instance_eval{curl_string("test", {})}.should match(/-F notify=notify/)
+    end
+
+    it "should set the distribution lists" do
+      @tf.instance_eval{curl_string("test", {})}.should match(/-F distribution_lists=list/)
+    end
+
+    it "should not set notify with no options" do
+      @tf.instance_eval{curl_string("test", nil)}.should_not match(/-F notify=notify/)
+    end
+
+    it "should not set distribution lists with no options" do
+      @tf.instance_eval{curl_string("test", nil)}.should_not match(/-F distribution_lists=list/)
+    end
   end
 end

data/spec/notify/email_spec.rb

@@ -1,8 +1,129 @@
 require 'spec_helper'
 require 'yolo/notify/email'
 require 'yolo/formatters'
+require 'yolo/config'
 
 describe Yolo::Notify::Email do
-  pending "all tests" do
+
+  before do
+    Yolo::Formatters::ErrorFormatter.any_instance.stub(:puts)
+    Yolo::Formatters::ProgressFormatter.any_instance.stub(:puts)
+
+    @settings = Yolo::Config::Settings
+    @settings.any_instance.stub(:mail_host){"test_host"}
+    @settings.any_instance.stub(:mail_from){"test_from"}
+    @settings.any_instance.stub(:mail_port){666}
+    @settings.any_instance.stub(:mail_account){"test_account"}
+    @settings.any_instance.stub(:mail_password){"test_password"}
+    @email = Yolo::Notify::Email.new
+    @email.stub(:body){"test body"}
+    @email.to = "test_to"
+  end
+
+  describe "when initilized" do
+    it "should load a server" do
+      @email.server.should eq("test_host")
+    end
+
+    it "should load a from address" do
+      @email.from.should eq("test_from")
+    end
+
+    it "should load a port" do
+      @email.port.should eq(666)
+    end
+
+    it "should load an account" do
+      @email.account.should eq("test_account")
+    end
+
+    it "should load a password" do
+      @email.password.should eq("test_password")
+    end
   end
+
+  describe "when sending" do
+    before do
+      @smtp = mock(Net::SMTP)
+      Net::SMTP.stub(:new){@smtp}
+      @smtp.stub(:start).and_yield
+      @smtp.stub(:send_message)
+      @smtp.stub(:enable_starttls)
+      @options = {}
+    end
+
+    describe "with an account" do
+      it "should send with tls" do
+        @smtp.should_receive(:enable_starttls)
+        @email.send(@options)
+      end
+
+      it "should send" do
+        @smtp.should_receive(:send_message).with("test body", "test_from", "test_to")
+        @email.send(@options)
+      end
+    end
+
+    describe "without an account" do
+      before do
+        @smtp.stub(:start).and_yield(@smtp)
+        @email.account = nil
+      end
+
+      it "should not send with tls" do
+        @smtp.should_not_receive(:enable_starttls)
+        @email.send(@options)
+      end
+
+      it "should send" do
+        @smtp.should_receive(:send_message).with("test body", "test_from", "test_to")
+        @email.send(@options)
+      end
+    end
+
+    describe "and loading options" do
+
+      before do
+        @email.to = "test_to"
+        @email.send(@options)
+      end
+
+      it "should load a server if missing" do
+        @options[:server].should eq("test_host")
+      end
+
+      it "should load a from address if missing" do
+        @options[:from].should eq("test_from")
+      end
+
+      it "should load a subject if missing" do
+        @options[:subject].should eq("New Build!")
+      end
+
+      it "should load a title if missing" do
+        @options[:title].should eq("New Build!")
+      end
+
+      it "should load a body if missing" do
+        @options[:body].should eq("test body")
+      end
+
+      it "should load a password if missing" do
+        @options[:password].should eq("test_password")
+      end
+
+      it "should load an account if missing" do
+        @options[:account].should eq("test_account")
+      end
+
+      it "should load a port if missing" do
+        @options[:port].should eq(666)
+      end
+
+      it "should load a to address if missing" do
+        @options[:to].should eq("test_to")
+      end
+    end
+  end
+
 end

data/spec/notify/ios/ota_email_spec.rb

@@ -2,8 +2,58 @@ require 'spec_helper'
 require 'yolo/notify/email'
 require 'yolo/notify/ios'
 require 'yolo/formatters'
+require 'yolo/config'
+require 'yolo/tools'
 
 describe Yolo::Notify::Ios::OTAEmail do
-  pending "all tests" do
+
+  before do
+    Yolo::Formatters::ErrorFormatter.any_instance.stub(:puts)
+    Yolo::Formatters::ProgressFormatter.any_instance.stub(:puts)
+
+    @settings = Yolo::Config::Settings
+    @settings.any_instance.stub(:mail_host){"test_host"}
+    @settings.any_instance.stub(:mail_from){"test_from"}
+    @settings.any_instance.stub(:mail_port){666}
+    @settings.any_instance.stub(:mail_account){"test_account"}
+    @settings.any_instance.stub(:mail_password){"test_password"}
+
+    @options = {:ota_password => "test_password", :ota_url => "test_url", :title => "test_title", :subject => "test subject"}
+
+    Yolo::Tools::Ios::ReleaseNotes.stub(:html){"test markdown"}
+  end
+
+  describe "when generating the body" do
+    before do
+      @email = Yolo::Notify::Ios::OTAEmail.new
+      file = mock(File)
+      file.stub(:read){"YOLO.TITLE YOLO.CONTENT YOLO.PASSWORD YOLO.LINK"}
+      File.stub(:open){file}
+    end
+
+    it "should contain the subject" do
+      @email.body(@options).should match(/test subject/)
+    end
+
+    it "should contain the password" do
+      @email.body(@options).should match(/test_password/)
+    end
+
+    it "should contain the link" do
+      @email.body(@options).should match(/test_url/)
+    end
+
+    it "should contain the markdown" do
+      @email.body(@options).should match(/test markdown/)
+    end
+
+    it "should contain the title" do
+      @email.body(@options).should match(/test_title/)
+    end
+
+    it "should remove the template password if password is missing" do
+      @options[:ota_password] = nil
+      @email.body(@options).should_not match(/YOLO.PASSWORD/)
+    end
   end
 end

data/spec/tasks/base_task_spec.rb

@@ -0,0 +1,22 @@
+require 'yolo/tasks'
+
+describe Yolo::Tasks::BaseTask do
+
+  describe "when returning a name" do
+    before do
+      @basetask = Yolo::Tasks::BaseTask.new
+    end
+
+    it "should return a target name if no scheme is set" do
+      @basetask.scheme = nil
+      @basetask.target = "TestTarget"
+      @basetask.name.should eq("TestTarget")
+    end
+
+    it "should return a scheme name if a scheme is set" do
+      @basetask.scheme = "TestScheme"
+      @basetask.target = nil
+      @basetask.name.should eq("TestScheme")
+    end
+  end
+end

data/spec/tasks/ios/build_spec.rb

@@ -0,0 +1,22 @@
+require 'yolo/tasks'
+
+describe Yolo::Tasks::Ios::Build do
+  describe "when building an options string" do
+    before do
+      @buildtask = Yolo::Tasks::Ios::Build.new
+    end
+
+    after do
+      @buildtask.configuration = nil
+    end
+
+    it "should append any additional options" do
+      @buildtask.build_opts_string("one", "two", "three").should match(/one two three/)
+    end
+
+    it "should skip code signing if a debug build" do
+      @buildtask.configuration = "Debug"
+      @buildtask.build_opts_string.should match(/CODE_SIGN_IDENTITY='' CODE_SIGNING_REQUIRED=NO/)
+    end
+  end
+end

data/spec/tasks/ios/calabash_spec.rb

@@ -0,0 +1,21 @@
+require 'yolo/tasks'
+
+describe Yolo::Tasks::Ios::Calabash do
+  before do
+    @calabash = Yolo::Tasks::Ios::Calabash.new
+  end
+
+  describe "when created" do
+    it "should set junit as the default format" do
+      @calabash.format.should eq(:junit)
+    end
+
+    it "should set the iphonesimulator as the default sdk" do
+      @calabash.sdk.should eq("iphonesimulator")
+    end
+
+    it "should set test-reports/calabash as the default output directory" do
+      @calabash.output_dir.should eq("test-reports/calabash")
+    end
+  end
+end

data/spec/tasks/ios/coverage_spec.rb

@@ -0,0 +1,32 @@
+require 'yolo/tasks'
+require 'yolo/tools'
+require 'active_support/all'
+describe Yolo::Tasks::Ios::Coverage do
+  before do
+    @xcode = mock(Yolo::Tools::Ios::Xcode)
+    @xcode.stub(:build_path)
+    Yolo::Tools::Ios::Xcode.stub(:new){@xcode}
+    @coverage = Yolo::Tasks::Ios::Coverage.new
+    @test_path = "blah/name-test/Build/Intermediates/name.build/Debug-iphonesimulator/name.build/Objects-normal"
+    @false_path = "blah/name-false/Build/Intermediates/name.build/Debug-iphonesimulator/name.build/Objects-normal"
+  end
+
+  describe "when getting a build path" do
+
+    before do
+      @coverage.stub(:name){"name"}
+    end
+
+    it "should find the directory" do
+      Find.stub(:find).and_yield(@test_path)
+      File.stub(:mtime){Time.now}
+      @coverage.build_path.should eq("blah/name-test/Build/Intermediates/name.build/Debug-iphonesimulator/name.build")
+    end
+
+    it "should find the latest directory" do
+      Find.stub(:find).and_yield(@test_path).and_yield(@false_path)
+      File.stub(:mtime).and_return(Time.now, Time.now - 1.day)
+      @coverage.build_path.should eq("blah/name-test/Build/Intermediates/name.build/Debug-iphonesimulator/name.build")
+    end
+  end
+end

data/spec/tasks/ios/ocunit_spec.rb

@@ -0,0 +1,5 @@
+require 'yolo/tasks'
+
+describe Yolo::Tasks::Ios::OCUnit do
+
+end

data/spec/tasks/ios/release_spec.rb

@@ -0,0 +1,5 @@
+require 'yolo/tasks'
+
+describe Yolo::Tasks::Ios::Release do
+
+end

data/spec/tools/ios/calabash_spec.rb

@@ -9,6 +9,12 @@ describe Yolo::Tools::Ios::Calabash do
 
   describe "when running " do
 
+    before do
+      @io = mock(IO)
+      IO.stub(:popen).and_yield(@io)
+      @io.stub(:readline)
+    end
+
     it "should execute the cucumber command" do
       IO.should_receive(:popen).with(/cucumber/)
       Yolo::Tools::Ios::Calabash.run()
@@ -24,6 +30,18 @@ describe Yolo::Tools::Ios::Calabash do
       Yolo::Tools::Ios::Calabash.run()
     end
 
+    it "should output to STDOUT" do
+      @io.stub(:readline).and_return("testline", nil)
+      Yolo::Tools::Ios::Calabash.should_receive(:puts).with("testline")
+      Yolo::Tools::Ios::Calabash.run
+    end
+
+    it "should catch EOFError exceptions" do
+      @io.stub(:readline).and_raise(EOFError)
+      Yolo::Tools::Ios::Calabash.should_receive(:puts)
+      Yolo::Tools::Ios::Calabash.run
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yolo
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodebuild-rb
@@ -123,6 +123,12 @@ files:
 - spec/notify/email_spec.rb
 - spec/notify/ios/ota_email_spec.rb
 - spec/spec_helper.rb
+- spec/tasks/base_task_spec.rb
+- spec/tasks/ios/build_spec.rb
+- spec/tasks/ios/calabash_spec.rb
+- spec/tasks/ios/coverage_spec.rb
+- spec/tasks/ios/ocunit_spec.rb
+- spec/tasks/ios/release_spec.rb
 - spec/tools/git_spec.rb
 - spec/tools/ios/calabash_spec.rb
 - spec/tools/ios/coverage_spec.rb