yolo 1.1.17 → 1.1.18

data/lib/yolo/config/settings.rb

@@ -58,20 +58,25 @@ module Yolo
       def update_config
         if File.directory?(yolo_dir) and File.exist?(yaml_path)
           @yaml = YAML::load_file yaml_path
-          unless @yaml["deployment"]["api_token"]
-            @yaml["deployment"]["api_token"] = "example"
-            File.open(yaml_path, 'w') {|f|
-              f.write(@yaml.to_yaml)
-            }
-            @formatter.config_updated(yaml_path)
-          end
-          unless @yaml["deployment"]["team_token"]
-            @yaml["deployment"]["team_token"] = "example"
-            File.open(yaml_path, 'w') {|f|
-              f.write(@yaml.to_yaml)
-            }
-            @formatter.config_updated(yaml_path)
-          end
+          update_yaml_setting(@yaml, "deployment", "api_token", "example")
+          update_yaml_setting(@yaml, "deployment", "team_token", "example")
+        end
+      end
+
+      #
+      # Check the config file for an api_token key and add it if missing
+      # @param yaml [Hash] The settings yaml hash
+      # @param key [String] The setting key to update
+      # @param setting [String] The setting to update
+      # @param default [String] [description]
+      #
+      def update_yaml_setting(yaml, key, setting, default)
+        unless yaml[key][setting]
+          yaml[key][setting] = default
+          File.open(yaml_path, 'w') {|f|
+            f.write(yaml.to_yaml)
+          }
+          @formatter.config_updated(yaml_path)
         end
       end
 
@@ -88,7 +93,9 @@ module Yolo
       #
       # @return [String] The deployment url defined in config.yml
       def deploy_url
-        @yaml["deployment"]["url"] if @yaml["deployment"]["url"] and @yaml["deployment"]["url"] != "http://example.com"
+        if @yaml["deployment"]["url"] != "http://example.com"
+          @yaml["deployment"]["url"]
+        end
       end
 
       #
@@ -96,7 +103,9 @@ module Yolo
       #
       # @return [String] The api token defined in config.yml
       def api_token
-        @yaml["deployment"]["api_token"] if @yaml["deployment"]["api_token"] and @yaml["deployment"]["api_token"] != "example"
+        if @yaml["deployment"]["api_token"] != "example"
+          @yaml["deployment"]["api_token"]
+        end
       end
 
       #
@@ -104,7 +113,9 @@ module Yolo
       #
       # @return [String] The team token defined in config.yml
       def team_token
-        @yaml["deployment"]["team_token"] if @yaml["deployment"]["team_token"] and @yaml["deployment"]["teamt_oken"] != "example"
+        if @yaml["deployment"]["teamt_token"] != "example"
+          @yaml["deployment"]["team_token"]
+        end
       end
 
       #
@@ -112,7 +123,9 @@ module Yolo
       #
       # @return [String] The mail account defined in config.yml
       def mail_account
-        @yaml["mail"]["account"] if @yaml["mail"]["account"] and @yaml["mail"]["account"] != "example@example.com"
+        if @yaml["mail"]["account"] != "example@example.com"
+          @yaml["mail"]["account"]
+        end
       end
 
       #
@@ -120,7 +133,9 @@ module Yolo
       #
       # @return [String] The mail password defined in config.yml
       def mail_password
-        @yaml["mail"]["password"] if @yaml["mail"]["password"]  and @yaml["mail"]["password"]  != "example"
+        if @yaml["mail"]["password"] != "example"
+          @yaml["mail"]["password"]
+        end
       end
 
       #
@@ -128,7 +143,9 @@ module Yolo
       #
       # @return [Number] The mail port defined in config.yml
       def mail_port
-        @yaml["mail"]["port"] if @yaml["mail"]["port"] and @yaml["mail"]["port"] != 0
+        if @yaml["mail"]["port"] != 0
+          @yaml["mail"]["port"]
+        end
       end
 
       #
@@ -136,7 +153,9 @@ module Yolo
       #
       # @return [String] The mail host defined in config.yml
       def mail_host
-        @yaml["mail"]["host"] if @yaml["mail"]["host"] and @yaml["mail"]["host"] != "your.server.ip"
+        if @yaml["mail"]["host"] != "your.server.ip"
+          return @yaml["mail"]["host"]
+        end
       end
 
       #
@@ -144,7 +163,9 @@ module Yolo
       #
       # @return [String] The from address defined in config.yml
       def mail_from
-        @yaml["mail"]["from"] if @yaml["mail"]["from"] and @yaml["mail"]["from"] != "example@example.com"
+        if @yaml["mail"]["from"] != "example@example.com"
+          return @yaml["mail"]["from"]
+        end
       end
 
       #

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

@@ -73,6 +73,7 @@ module Yolo
         def folder_name
           folder_name = name
           folder_name = "#{name}-#{self.configuration}" if self.configuration
+          folder_name
         end
 
         #

data/lib/yolo/tools/git.rb

@@ -28,14 +28,13 @@ module Yolo
       #
       # @return [BOOL] returns if there is a new commit to build
       def has_new_commit(name)
-        self.project_name = name unless name.nil?
-        commit = latest_commit
-        if yaml_commit == commit
+        set_project_name(name)
+        if yaml_commit == latest_commit
           @formatter.no_new_commit
           false
         else
-          @formatter.new_commit(commit)
-          update_commit(commit)
+          @formatter.new_commit(latest_commit)
+          update_commit(latest_commit)
           true
         end
       end
@@ -46,14 +45,13 @@ module Yolo
       #
       # @return [BOOL] returns if there is a new tag to build
       def has_new_tag(name)
-        self.project_name = name unless name.nil?
-        tag = latest_tag
-        if yaml_tag == tag
+        set_project_name(name)
+        if yaml_tag == latest_tag
           @formatter.no_new_tag
           false
         else
-          @formatter.new_tag(tag)
-          update_tag(tag)
+          @formatter.new_tag(latest_tag)
+          update_tag(latest_tag)
           true
         end
       end
@@ -76,6 +74,12 @@ module Yolo
 
       private
 
+      #
+      # Sets the current project name
+      #
+      def set_project_name(name)
+        self.project_name = name unless name.nil?
+      end
 
       #
       # Updates the tag history

data/spec/tasks/ios/coverage_spec.rb

@@ -1,6 +1,7 @@
 require 'yolo/tasks'
 require 'yolo/tools'
 require 'active_support/all'
+
 describe Yolo::Tasks::Ios::Coverage do
   before do
     @xcode = mock(Yolo::Tools::Ios::Xcode)

data/spec/tasks/ios/ocunit_spec.rb

@@ -1,5 +1,28 @@
 require 'yolo/tasks'
 
 describe Yolo::Tasks::Ios::OCUnit do
+  before do
+    @ocunit = Yolo::Tasks::Ios::OCUnit.new
+  end
 
+  describe "when created" do
+    it "should set the iphonesimulator as the default sdk" do
+      @ocunit.sdk.should eq("iphonesimulator")
+    end
+
+    it "should set junit as the default test output" do
+      @ocunit.test_output.should eq(:junit)
+    end
+  end
+
+  describe "when building an options string" do
+    it "should append additional options" do
+      @ocunit.build_opts_string("one","two","three").should match(/one two three/)
+    end
+
+    it "should pipe output to ocunit2junit" do
+      @ocunit.test_output = :junit
+      @ocunit.build_opts_string.should match(/2>&1 | ocunit2junit/)
+    end
+  end
 end

data/spec/tasks/ios/release_spec.rb

@@ -1,5 +1,177 @@
 require 'yolo/tasks'
+require 'yolo/tools'
+require 'yolo/notify'
+require "yolo/formatters"
+require "yolo/config"
+require "yolo/deployment"
+require 'active_support/all'
 
 describe Yolo::Tasks::Ios::Release do
+  before do
+    @xcode = mock(Yolo::Tools::Ios::Xcode)
+    @xcode.stub(:build_path)
+    Yolo::Tools::Ios::Xcode.stub(:new){@xcode}
 
+    @email = mock(Yolo::Notify::Ios::OTAEmail)
+    @email.stub(:send)
+    Yolo::Notify::Ios::OTAEmail.stub(:new){@email}
+
+    @ota = mock(Yolo::Deployment::OTA)
+    Yolo::Deployment::OTA.stub(:new){@ota}
+
+    Yolo::Config::Settings.instance.stub(:bundle_directory){"test_directory"}
+
+    Yolo::Formatters::ErrorFormatter.any_instance.stub(:puts)
+    Yolo::Formatters::ProgressFormatter.any_instance.stub(:puts)
+
+    @release = Yolo::Tasks::Ios::Release.new
+
+    @test_path = "blah/name-test/Build/Products/Debug-iphoneos/name.app"
+    @false_path = "blah/name-test/Build/Products/Release-iphoneos/name.app"
+  end
+
+  describe "when created" do
+    it "should set iphoneos as the default sdk" do
+      @release.sdk.should eq("iphoneos")
+    end
+
+    it "should set OTA as the default deployment" do
+      @release.deployment.should eq(:OTA)
+    end
+  end
+
+  describe "when getting the app path" do
+    before do
+      @release.stub(:name){"name"}
+    end
+
+    it "should find the directory" do
+      Find.stub(:find).and_yield(@test_path)
+      File.stub(:mtime){Time.now}
+      @release.app_path.should eq(@test_path)
+    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)
+      @release.app_path.should eq(@test_path)
+    end
+  end
+
+  describe "when getting the dsym path" do
+    before do
+      @release.stub(:app_path){"path/to/test.app"}
+    end
+
+    it "should get the path from the app path" do
+      @release.dsym_path.should eq("path/to/test.app.dSYM")
+    end
+  end
+
+  describe "when getting the bundle path" do
+    before do
+      @release.stub(:folder_name){"folder"}
+      @release.stub(:version){"1.0"}
+    end
+
+    it "should generate the path" do
+      @release.bundle_path.should eq("test_directory/folder/1.0")
+    end
+  end
+
+  describe "when getting the folder name" do
+    before do
+      @release.stub(:name){"name"}
+    end
+
+    it "should append the configuration if present" do
+      @release.configuration = "Debug"
+      @release.folder_name.should eq("name-Debug")
+    end
+
+    it "should use the app name if no configuration is set" do
+      @release.configuration = nil
+      @release.folder_name.should eq("name")
+    end
+  end
+
+  describe "when getting the info plist path" do
+    before do
+      @release.stub(:name){"name"}
+      @path = "/path/to/name-Info.plist"
+      Find.stub(:find).and_yield(@path)
+    end
+
+    it "should find the plist" do
+      @release.info_plist_path.should eq(@path)
+    end
+  end
+
+  describe "when getting the version" do
+    before do
+      @xcode.stub(:info_plist_path=)
+    end
+
+    it "should get the version string from xcode" do
+      @xcode.stub(:version_number){"1.0"}
+      @xcode.stub(:build_number){"1.0"}
+
+      @release.version.should eq("1.0-1.0")
+    end
+
+    it "should use the current time if xcode cant find the version" do
+      @xcode.stub(:version_number){nil}
+      @xcode.stub(:build_number){nil}
+
+      @time = mock(Time)
+      Time.stub(:now){@time}
+      @time.stub(:day){"Monday"}
+      @time.stub(:month){"Jan"}
+      @time.stub(:year){"2013"}
+      @time.stub(:hour){"1"}
+      @time.stub(:min){"1"}
+      @time.stub(:sec){"1"}
+
+      @release.version.should eq("Monday-Jan-2013-1-1-1")
+    end
+  end
+
+  describe "when deploying" do
+    before do
+      @ota.stub(:deploy)
+      @release.stub(:version){"1.0"}
+      @release.stub(:name){"testname"}
+    end
+
+    it "should create a class from the deployment symbol" do
+      @ota.should_receive(:deploy)
+      @release.deploy("")
+    end
+
+    it "should not try and deploy a nil class" do
+      Yolo::Deployment::OTA.stub(:new){nil}
+      Yolo::Formatters::ErrorFormatter.any_instance.should_receive(:deployment_class_error)
+      @release.deploy("")
+    end
+
+    it "shouldnt build mail options without a url" do
+      @ota.stub(:deploy).and_yield(nil, nil)
+      @email.should_not_receive(:send)
+      @release.deploy("")
+    end
+
+    it "should build mail options once deployed" do
+      @release.mail_to = "test@test.com"
+      @ota.stub(:deploy).and_yield("url", "password")
+      @email.should_receive(:send).with(
+        {
+          :to => "test@test.com",
+          :ota_url => "url",
+          :subject=>"New testname build: 1.0",
+          :title=>"testname",
+          :ota_password=>"password"
+        })
+      @release.deploy("")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yolo
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.18
   prerelease: 
 platform: ruby
 authors:
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: YOLO!