Permalink
Browse files

More renaming work.

  • Loading branch information...
1 parent 4ee802d commit 55706959c545e23170cb92c4ecd27c4d0a73eeb1 @alloy alloy committed Sep 17, 2011
View
@@ -4,6 +4,6 @@ if $0 == __FILE__
$:.unshift File.expand_path('../../lib', __FILE__)
end
-require 'cocoa_pods'
+require 'cocoapods'
Pod::Command.run(*ARGV)
View
@@ -48,7 +48,7 @@ def self.run(*argv)
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
@@ -9,12 +9,12 @@ def self.banner
$ 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
@@ -6,7 +6,7 @@ def self.banner
$ 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 @@ def initialize(argv)
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
View
@@ -16,7 +16,7 @@ def self.instance=(instance)
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
View
@@ -3,12 +3,11 @@ class Source
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
View
@@ -13,9 +13,6 @@
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
View
@@ -7,7 +7,7 @@ def self.tmp_repos_path
module Git
def tmp_repos_path
- SpecHelper.temporary_directory + 'cocoa-pods'
+ SpecHelper.temporary_directory + 'cocoapods'
end
module_function :tmp_repos_path
@@ -15,7 +15,7 @@
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
View
@@ -15,7 +15,7 @@
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

0 comments on commit 5570695

Please sign in to comment.