yolo 1.2.0 → 1.2.1

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

@@ -37,9 +37,10 @@ module Yolo
         def app_path
           files = []
           Find.find(@xcode.build_path) do |path|
-            files << path if path =~ /.*#{name}-.*\/Build\/Products\/.*-iphoneos\/.*\.app$/
+            files << path if path =~ /\/Build\/Products\/.*-iphoneos\/#{name}\.app$/
           end
-          files.sort_by { |filename| File.mtime(filename)}.last # get the latest
+          path = files.sort_by { |filename| File.mtime(filename)}.last # get the latest
+          path
         end
 
         #
@@ -118,24 +119,45 @@ module Yolo
         # @param  ipa_path [String] The full path to the IPA file to deploy
         #
         def deploy(ipa_path)
+          klass = deploy_class_from_string "#{self.deployment.to_s}"
+          if klass
+            klass.deploy(ipa_path, options) do |url, password|
+              send_notification(url, password)
+            end
+          end
+        end
+
+        #
+        # Sends a notificaiton email from a deployment
+        # @param  url [String] The URL which the build has been deplyed too
+        # @param  password [String] The password required to install the build
+        #
+        # @return [type] [description]
+        def send_notification(url, password)
+          if url
+            mail_options = {
+              :to => self.mail_to,
+              :ota_url => url,
+              :subject => "New #{name} build: #{version}",
+              :title => name
+            }
+            mail_options[:ota_password] = password if password
+            @emailer.send(mail_options)
+          end
+        end
+
+        #
+        # Initlizes an object from a deployment string
+        # @param  string [String] the deployment class name string
+        #
+        # @return [Object] an object of type specified in the paramater
+        def deploy_class_from_string(string)
           klass = Object.const_get("Yolo").const_get("Deployment").const_get("#{self.deployment.to_s}").new
           unless klass
             @error_formatter.deployment_class_error(self.deployment.to_s)
             return
           end
-
-          klass.deploy(ipa_path, options) do |url, password|
-            if url
-              mail_options = {
-                :to => self.mail_to,
-                :ota_url => url,
-                :subject => "New #{name} build: #{version}",
-                :title => name
-              }
-              mail_options[:ota_password] = password if password
-              @emailer.send(mail_options)
-            end
-          end
+          klass
         end
 
         #

data/lib/yolo/tools/git.rb

@@ -146,7 +146,8 @@ module Yolo
       #
       # @return [String] The commit hash
       def latest_commit
-        match = log.scan(/\b[0-9a-f]{5,40}\b/).first
+        matches = log.scan(/\b[0-9a-f]{5,40}\b/)
+        match = matches.first
         if match.nil?
           ""
         else

data/spec/config/install_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Config::Install do
   describe "when installing" do

data/spec/config/settings_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Config::Settings do
 
@@ -47,6 +48,12 @@ describe Yolo::Config::Settings do
       File.stub(:open)
       File.stub(:exist?){true}
       File.stub(:directory?){true}
+      @yaml = {
+        "deployment" => {
+          "api_token" => nil,
+          "team_token" => nil
+        }
+      }
     end
 
     it "should add an api token if missing" do
@@ -62,6 +69,16 @@ describe Yolo::Config::Settings do
       Yolo::Config::Settings.instance.update_config
       @yaml["deployment"]["team_token"].should eq("example")
     end
+
+    it "should write the new config file to disk" do
+      YAML.stub(:load_file){@yaml}
+      file = mock(File)
+      file.stub(:write)
+      File.stub(:open).and_yield(file)
+
+      file.should_receive(:write)
+      Yolo::Config::Settings.instance.update_config
+    end
   end
 
   describe "when asked for settings" do

data/spec/deployment/base_deployer_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Deployment::BaseDeployer do
 

data/spec/deployment/ota_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Deployment::OTA do
 
@@ -90,6 +91,12 @@ describe Yolo::Deployment::OTA do
       @ota.upload_complete("json")
     end
 
+    it "should not continue if json parsing fails" do
+      JSON.stub(:parse){nil}
+      @error_formatter.should_receive(:deploy_failed)
+      @ota.upload_complete("json")
+    end
+
     it "should parse the response" do
       @ota.deploy("test", nil) do |url, password|
         password.should eq("test_password")

data/spec/deployment/test_flight_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Deployment::TestFlight do
 

data/spec/notify/email_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Notify::Email do
 
@@ -6,6 +7,9 @@ describe Yolo::Notify::Email do
     Yolo::Formatters::ErrorFormatter.any_instance.stub(:puts)
     Yolo::Formatters::ProgressFormatter.any_instance.stub(:puts)
 
+    @error_formatter = mock(Yolo::Formatters::ErrorFormatter)
+    Yolo::Formatters::ErrorFormatter.stub(:new){@error_formatter}
+
     @settings = Yolo::Config::Settings
     @settings.any_instance.stub(:mail_host){"test_host"}
     @settings.any_instance.stub(:mail_from){"test_from"}
@@ -13,7 +17,6 @@ describe Yolo::Notify::Email do
     @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
 
@@ -37,6 +40,10 @@ describe Yolo::Notify::Email do
     it "should load a password" do
       @email.password.should eq("test_password")
     end
+
+    it "should return an empty body" do
+      @email.body({}).should eq("")
+    end
   end
 
   describe "when sending" do
@@ -47,6 +54,7 @@ describe Yolo::Notify::Email do
       @smtp.stub(:send_message)
       @smtp.stub(:enable_starttls)
       @options = {}
+      @email.stub(:body){"test body"}
     end
 
     describe "with an account" do
@@ -65,6 +73,7 @@ describe Yolo::Notify::Email do
       before do
         @smtp.stub(:start).and_yield(@smtp)
         @email.account = nil
+        @email.stub(:body){"test body"}
       end
 
       it "should not send with tls" do
@@ -76,6 +85,12 @@ describe Yolo::Notify::Email do
         @smtp.should_receive(:send_message).with("test body", "test_from", "test_to")
         @email.send(@options)
       end
+
+      it "should output an error if missing details" do
+        @email.server = nil
+        @error_formatter.should_receive(:missing_email_details)
+        @email.send(@options)
+      end
     end
 
     describe "and loading options" do
@@ -83,6 +98,7 @@ describe Yolo::Notify::Email do
       before do
         @email.to = "test_to"
         @email.send(@options)
+        @email.stub(:body){"test body"}
       end
 
       it "should load a server if missing" do

data/spec/notify/ios/ota_email_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Notify::Ios::OTAEmail do
 

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'coveralls'
-require 'yolo'
 require 'active_support/all'
 
 Coveralls.wear!

data/spec/tasks/base_task_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tasks::BaseTask do
 

data/spec/tasks/ios/build_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tasks::Ios::Build do
   describe "when building an options string" do

data/spec/tasks/ios/calabash_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tasks::Ios::Calabash do
   before do

data/spec/tasks/ios/coverage_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tasks::Ios::Coverage do
   before do

data/spec/tasks/ios/ocunit_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tasks::Ios::OCUnit do
   before do

data/spec/tasks/ios/release_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tasks::Ios::Release do
   before do

data/spec/tools/git_spec.rb

@@ -1,14 +1,19 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tools::Git do
 
   before do
-    @git = Yolo::Tools::Git.new
-    @git.project_name = "test"
     YAML.stub!(:load_file){{}}
     Yolo::Formatters::ProgressFormatter.any_instance.stub(:puts)
   end
 
+  before(:each) do
+    @git = Yolo::Tools::Git.new
+    @git.project_name = "test"
+    File.any_instance.stub(:write)
+  end
+
   describe "when checking for new commits" do
     before do
       @git.stub(:update_commit)
@@ -25,6 +30,11 @@ describe Yolo::Tools::Git do
       Yolo::Tools::Git.any_instance.stub(:latest_commit){"old"}
       @git.has_new_commit("").should eq(false)
     end
+
+    it "yaml tag should be empty if no project is set" do
+      @git.project_name = nil
+      @git.instance_eval{yaml_tag}.should eq("")
+    end
   end
 
   describe "when checking for new tags" do
@@ -43,6 +53,11 @@ describe Yolo::Tools::Git do
       Yolo::Tools::Git.any_instance.stub(:latest_tag){"old"}
       @git.has_new_tag("").should eq(false)
     end
+
+    it "yaml commit should be empty if no project is set" do
+      @git.project_name = nil
+      @git.instance_eval{yaml_commit}.should eq("")
+    end
   end
 
   describe "when updating tags and commits" do
@@ -71,6 +86,20 @@ describe Yolo::Tools::Git do
       @git.instance_eval{yaml_commit}.should match("new commit")
     end
 
+    it "should overwrite the existing tag" do
+      @yaml = {"test" => {"tag" => "v1.2"}}
+      @git.instance_variable_set(:@yaml, @yaml)
+      @git.instance_eval{update_tag("new tag")}
+      @yaml["test"]["tag"].should eq("new tag")
+    end
+
+    it "should overwrite the existing commit" do
+      @yaml = {"test" => {"commit" => "1234567891023"}}
+      @git.instance_variable_set(:@yaml, @yaml)
+      @git.instance_eval{update_commit("new commit")}
+      @yaml["test"]["commit"].should eq("new commit")
+    end
+
   end
 
   describe "when saving data" do
@@ -96,6 +125,20 @@ describe Yolo::Tools::Git do
       @git.instance_eval{latest_tag}.should eq("v1.0")
     end
 
+    it "should not get invalid tags" do
+      @log = ""
+      @log.stub(:scan){}
+      @git.stub(:log){@log}
+      @git.instance_eval{latest_tag}.should eq("")
+    end
+
+    it "should not get invalid commits" do
+      @log = ""
+      @log.stub(:scan){[]}
+      @git.stub(:log){@log}
+      @git.instance_eval{latest_commit}.should eq("")
+    end
+
     it "should ignore jenkins tags" do
       @git.stub(:log){"tag: jenkins-tag, head, tag: v1.3.1, master"}
       @git.instance_eval{latest_tag}.should_not eq("jenkins-tag")

data/spec/tools/ios/calabash_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tools::Ios::Calabash do
 

data/spec/tools/ios/coverage_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tools::Ios::Coverage do
 

data/spec/tools/ios/ipa_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tools::Ios::IPA do
 

data/spec/tools/ios/release_notes_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tools::Ios::ReleaseNotes do
 

data/spec/tools/ios/xcode_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'yolo'
 
 describe Yolo::Tools::Ios::Xcode do
   before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yolo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodebuild-rb