[Specs] Minor clean up and cosmetic fixes.

spec/unit/command/install_command_spec.rb → spec/functional/command/install_spec.rb

 require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Pod::Command::Install" do
+  extend SpecHelper::Command
+  extend SpecHelper::TemporaryDirectory
+  extend SpecHelper::TemporaryRepos
+
   it "should include instructions on how to reference the xcode project" do
     Pod::Command::Install.banner.should.match %r{xcodeproj 'path/to/XcodeProject'}
   end
-end
 
+  it "tells the user that no Podfile or podspec was found in the current working dir" do
+    exception = lambda { run_command('install','--no-update') }.should.raise Pod::Informative
+    exception.message.should.include "No `Podfile' found in the current working directory."
+  end
+end

spec/integration_spec.rb

@@ -69,7 +69,7 @@ else
         target = target_definition
         with_xcodebuild_available do
           Dir.chdir(config.project_pods_root) do
-            puts "\n[!] Compiling #{target.label} static library..."
+            print "[!] Compiling #{target.label}...\r"
             should_successfully_perform "xcodebuild -target '#{target.label}'"
             lib_path = config.project_pods_root + "build/Release#{'-iphoneos' if target.platform == :ios}" + target.lib_name
             `lipo -info '#{lib_path}'`.should.include "architecture: #{target.platform == :ios ? 'armv7' : 'x86_64'}"
@@ -117,7 +117,7 @@ else
           }
         end
 
-        it "install a dummy source file" do
+        it "installs a dummy source file" do
           create_config!
           podfile = Pod::Podfile.new do
             self.platform :ios

spec/unit/command_spec.rb

@@ -15,12 +15,3 @@ describe "Pod::Command::Repo" do
   end
 end
 
-describe "Pod::Command::Install" do
-  it "tells the user that no Podfile or podspec was found in the current working dir" do
-    command = Pod::Command::Install.new(argv)
-    exception = lambda {
-      command.run
-    }.should.raise Pod::Informative
-    exception.message.should.include "No `Podfile' found in the current working directory."
-  end
-end

spec/unit/installer_spec.rb

@@ -2,18 +2,15 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Pod::Installer" do
   before do
-    @config_before = config
-    Pod::Config.instance = nil
-    config.silent = true
     config.repos_dir = fixture('spec-repos')
     config.project_pods_root = fixture('integration')
   end
 
   after do
-    Pod::Config.instance = @config_before
+    config.repos_dir = SpecHelper.tmp_repos_path
   end
 
-  describe ", by default," do
+  describe "by default" do
     before do
       podfile = Pod::Podfile.new do
         platform :ios

spec/unit/platform_spec.rb

 require File.expand_path('../../spec_helper', __FILE__)
 
 describe Pod::Platform do
-  it "returns a new Platform instance" do
-    Pod::Platform.ios.should == Pod::Platform.new(:ios)
-    Pod::Platform.osx.should == Pod::Platform.new(:osx)
-  end
-
-  before do
-    @platform = Pod::Platform.ios
-  end
-
-  it "exposes it's symbolic name" do
-    @platform.name.should == :ios
-  end
-
-  it "can be compared for equality with another platform with the same symbolic name" do
-    @platform.should == Pod::Platform.new(:ios)
-  end
-
-  it "can be compared for equality with another platform with the same symbolic name and the same deployment target" do
-    @platform.should.not == Pod::Platform.new(:ios, '4.0')
-    Pod::Platform.new(:ios, '4.0').should == Pod::Platform.new(:ios, '4.0')
-  end
-
-  it "can be compared for equality with a matching symbolic name (backwards compatibility reasons)" do
-    @platform.should == :ios
-  end
-
-  it "presents an accurate string representation" do
-    @platform.to_s.should == "iOS"
-    Pod::Platform.new(:osx).to_s.should == 'OS X'
-    Pod::Platform.new(nil).to_s.should  == "iOS - OS X"
-    Pod::Platform.new(:ios, '5.0.0').to_s.should == 'iOS 5.0.0'
-    Pod::Platform.new(:osx, '10.7').to_s.should  == 'OS X 10.7'
-  end
-
-  it "uses it's name as it's symbold version" do
-    @platform.to_sym.should == :ios
-  end
-
-  it "allows to specify the deployment target on initialization" do
-    p = Pod::Platform.new(:ios, '4.0.0')
-    p.deployment_target.should == Pod::Version.new('4.0.0')
-  end
-
-  it "allows to specify the deployment target in a hash on initialization (backwards compatibility from 0.6)" do
-    p = Pod::Platform.new(:ios, { :deployment_target => '4.0.0' })
-    p.deployment_target.should == Pod::Version.new('4.0.0')
-  end
-
-  it "allows to specify the deployment target after initialization" do
-    p = Pod::Platform.new(:ios, '4.0.0')
-    p.deployment_target = '4.0.0'
-    p.deployment_target.should == Pod::Version.new('4.0.0')
-    p.deployment_target = Pod::Version.new('4.0.0')
-    p.deployment_target.should == Pod::Version.new('4.0.0')
-  end
-end
-
-describe "Pod::Platform with a nil value" do
-  before do
-    @platform = Pod::Platform.new(nil)
-  end
-
-  it "behaves like a nil object" do
-    @platform.should.be.nil
-  end
-end
-
-describe "Pod::Platform#supports?" do
-  it "supports another platform is with the same operating system" do
-    p1 = Pod::Platform.new(:ios)
-    p2 = Pod::Platform.new(:ios)
-    p1.should.supports?(p2)
-
-    p1 = Pod::Platform.new(:osx)
-    p2 = Pod::Platform.new(:osx)
-    p1.should.supports?(p2)
-  end
-
-  it "supports a nil platform" do
-    p1 = Pod::Platform.new(:ios)
-    p1.should.supports?(nil)
-  end
-
-  it "supports a platform with a lower or equal deployment_target" do
-    p1 = Pod::Platform.new(:ios, '5.0')
-    p2 = Pod::Platform.new(:ios, '4.0')
-    p1.should.supports?(p1)
-    p1.should.supports?(p2)
-    p2.should.not.supports?(p1)
-  end
-
-  it "supports a platform regardless of the deployment_target if one of the two does not specify it" do
-    p1 = Pod::Platform.new(:ios)
-    p2 = Pod::Platform.new(:ios, '4.0')
-    p1.should.supports?(p2)
-    p2.should.supports?(p1)
-  end
-
-  it "doesn't supports a platform with a different operating system" do
-    p1 = Pod::Platform.new(:ios)
-    p2 = Pod::Platform.new(:osx)
-    p1.should.not.supports?(p2)
+  describe "by default" do
+    it "returns a new Platform instance" do
+      Pod::Platform.ios.should == Pod::Platform.new(:ios)
+      Pod::Platform.osx.should == Pod::Platform.new(:osx)
+    end
+
+    before do
+      @platform = Pod::Platform.ios
+    end
+
+    it "exposes it's symbolic name" do
+      @platform.name.should == :ios
+    end
+
+    it "can be compared for equality with another platform with the same symbolic name" do
+      @platform.should == Pod::Platform.new(:ios)
+    end
+
+    it "can be compared for equality with another platform with the same symbolic name and the same deployment target" do
+      @platform.should.not == Pod::Platform.new(:ios, '4.0')
+      Pod::Platform.new(:ios, '4.0').should == Pod::Platform.new(:ios, '4.0')
+    end
+
+    it "can be compared for equality with a matching symbolic name (backwards compatibility reasons)" do
+      @platform.should == :ios
+    end
+
+    it "presents an accurate string representation" do
+      @platform.to_s.should == "iOS"
+      Pod::Platform.new(:osx).to_s.should == 'OS X'
+      Pod::Platform.new(nil).to_s.should  == "iOS - OS X"
+      Pod::Platform.new(:ios, '5.0.0').to_s.should == 'iOS 5.0.0'
+      Pod::Platform.new(:osx, '10.7').to_s.should  == 'OS X 10.7'
+    end
+
+    it "uses it's name as it's symbold version" do
+      @platform.to_sym.should == :ios
+    end
+
+    it "allows to specify the deployment target on initialization" do
+      p = Pod::Platform.new(:ios, '4.0.0')
+      p.deployment_target.should == Pod::Version.new('4.0.0')
+    end
+
+    it "allows to specify the deployment target in a hash on initialization (backwards compatibility from 0.6)" do
+      p = Pod::Platform.new(:ios, { :deployment_target => '4.0.0' })
+      p.deployment_target.should == Pod::Version.new('4.0.0')
+    end
+
+    it "allows to specify the deployment target after initialization" do
+      p = Pod::Platform.new(:ios, '4.0.0')
+      p.deployment_target = '4.0.0'
+      p.deployment_target.should == Pod::Version.new('4.0.0')
+      p.deployment_target = Pod::Version.new('4.0.0')
+      p.deployment_target.should == Pod::Version.new('4.0.0')
+    end
+  end
+
+  describe "with a nil value" do
+    before do
+      @platform = Pod::Platform.new(nil)
+    end
+
+    it "behaves like a nil object" do
+      @platform.should.be.nil
+    end
+  end
+
+  describe "regarding supporting platforms" do
+    it "supports platforms with the same operating system" do
+      p1 = Pod::Platform.new(:ios)
+      p2 = Pod::Platform.new(:ios)
+      p1.should.supports?(p2)
+
+      p1 = Pod::Platform.new(:osx)
+      p2 = Pod::Platform.new(:osx)
+      p1.should.supports?(p2)
+    end
+
+    it "supports a nil platform" do
+      p1 = Pod::Platform.new(:ios)
+      p1.should.supports?(nil)
+    end
+
+    it "supports a platform with a lower or equal deployment_target" do
+      p1 = Pod::Platform.new(:ios, '5.0')
+      p2 = Pod::Platform.new(:ios, '4.0')
+      p1.should.supports?(p1)
+      p1.should.supports?(p2)
+      p2.should.not.supports?(p1)
+    end
+
+    it "supports a platform regardless of the deployment_target if one of the two does not specify it" do
+      p1 = Pod::Platform.new(:ios)
+      p2 = Pod::Platform.new(:ios, '4.0')
+      p1.should.supports?(p2)
+      p2.should.supports?(p1)
+    end
+
+    it "doesn't supports a platform with a different operating system" do
+      p1 = Pod::Platform.new(:ios)
+      p2 = Pod::Platform.new(:osx)
+      p1.should.not.supports?(p2)
+    end
   end
 end

spec/unit/podfile_spec.rb

@@ -25,7 +25,7 @@ describe "Pod::Podfile" do
     dep = podfile.dependency_by_top_level_spec_name('SomeExternalPod')
     dep.external_source.params.should == { :git => 'GIT-URL', :commit => '1234' }
   end
-  
+
   it "adds a subspec dependency on a Pod repo outside of a spec repo (the repo is expected to contain a podspec)" do
     podfile = Pod::Podfile.new do
       dependency 'MainSpec/FirstSubSpec', :git => 'GIT-URL', :commit => '1234'