More renaming work.

bin/pod

@@ -4,6 +4,6 @@ if $0 == __FILE__
   $:.unshift File.expand_path('../../lib', __FILE__)
 end
 
-require 'cocoa_pods'
+require 'cocoapods'
 
 Pod::Command.run(*ARGV)

lib/cocoapods/command.rb

@@ -48,7 +48,7 @@ module Pod
     rescue Exception => e
       unless e.is_a?(Informative)
         puts "Oh no, an error occurred. Please run with `--verbose' and report " \
-             "on https://github.com/alloy/cocoa-pods/issues."
+             "on https://github.com/alloy/cocoapods/issues."
         puts ""
       end
       puts e.message

lib/cocoapods/command/repo.rb

@@ -9,12 +9,12 @@ module Pod
     $ pod help repo
 
       pod repo add NAME URL
-        Clones `URL' in the local spec-repos directory at `~/.cocoa-pods'. The
+        Clones `URL' in the local spec-repos directory at `~/.cocoapods'. The
         remote can later be referred to by `NAME'.
 
       pod repo update NAME
         Updates the local clone of the spec-repo `NAME'. If `NAME' is omitted
-        this will update all spec-repos in `~/.cocoa-pods'.}
+        this will update all spec-repos in `~/.cocoapods'.}
       end
 
       extend Executable

lib/cocoapods/command/setup.rb

@@ -6,7 +6,7 @@ module Pod
 
     $ pod setup
 
-      Creates a directory at `~/.cocoa-pods' which will hold your spec-repos.
+      Creates a directory at `~/.cocoapods' which will hold your spec-repos.
       This is where it will create a clone of the public `master' spec-repo.}
       end
 
@@ -15,7 +15,7 @@ module Pod
       end
 
       def master_repo_url
-        'git://github.com/alloy/cocoa-pod-specs.git'
+        'git://github.com/alloy/cocoapods-specs.git'
       end
 
       def add_master_repo_command

lib/cocoapods/config.rb

@@ -16,7 +16,7 @@ module Pod
     alias_method :silent?,  :silent
 
     def initialize
-      @repos_dir = Pathname.new(File.expand_path("~/.cocoa-pods"))
+      @repos_dir = Pathname.new(File.expand_path("~/.cocoapods"))
       @clean = true
       @verbose = false
       @silent = false

lib/cocoapods/source.rb

@@ -3,12 +3,11 @@ module Pod
     def self.all
       @sources ||= begin
         repos_dir = Config.instance.repos_dir
-        sources = repos_dir.children.select(&:directory?).map { |repo| new(repo) }
-        if sources.empty?
+        unless repos_dir.exist?
           raise Informative, "No spec repos found in `#{repos_dir}'. " \
                              "To fetch the `master' repo run: $ pod setup"
         end
-        sources
+        repos_dir.children.select(&:directory?).map { |repo| new(repo) }
       end
     end
 

spec/spec_helper.rb

@@ -13,9 +13,6 @@ require 'spec_helper/git'
 require 'spec_helper/log'
 require 'spec_helper/temporary_directory'
 
-#TMP_DIR = SpecHelper::TemporaryDirectory.temporary_directory
-#TMP_COCOA_PODS_DIR = File.join(TMP_DIR, 'cocoa-pods')
-
 context_class = defined?(BaconContext) ? BaconContext : Bacon::Context
 context_class.class_eval do
   include Pod::Config::Mixin

spec/spec_helper/git.rb

@@ -7,7 +7,7 @@ module SpecHelper
 
   module Git
     def tmp_repos_path
-      SpecHelper.temporary_directory + 'cocoa-pods'
+      SpecHelper.temporary_directory + 'cocoapods'
     end
     module_function :tmp_repos_path
 

spec/unit/command_spec.rb

@@ -15,7 +15,7 @@ describe "Pod::Command::Setup" do
 
   it "returns the URL of the `master' spec-repo" do
     command = Pod::Command::Setup.new(argv)
-    command.master_repo_url.should == 'git://github.com/alloy/cocoa-pod-specs.git'
+    command.master_repo_url.should == 'git://github.com/alloy/cocoapods-specs.git'
   end
 end
 

spec/unit/config_spec.rb

@@ -15,7 +15,7 @@ describe "Pod::Config" do
   end
 
   it "returns the path to the spec-repos dir" do
-    config.repos_dir.should == Pathname.new("~/.cocoa-pods").expand_path
+    config.repos_dir.should == Pathname.new("~/.cocoapods").expand_path
   end
 
   describe "concerning a user's project, which is expected in the current working directory" do