renamed ConfigManager to Manager and ConfigEnvironment to Environment

bin/sandbox-pod

@@ -81,7 +81,7 @@ PROFILE_ERB_TEMPLATE = <<-EOS
     #"^<%= ruby_prefix %>"
     #"^<%= pod_prefix %>"
     #"^<%= xcode_app_path %>"
-    #"^<%= Pod::Config::ConfigEnvironment.repos_dir %>"
+    #"^<%= Pod::Config::Environment.instance.repos_dir %>"
 <% prefixes.each do |prefix| %>
     #"^<%= prefix %>/*"
 <% end %>
@@ -94,8 +94,8 @@ PROFILE_ERB_TEMPLATE = <<-EOS
     "/dev/null"
   )
   (regex
-    #"^<%= Pod::Config::ConfigEnvironment.instance.project_root %>"
-    #"^<%= Pod::Config::ConfigEnvironment.instance.repos_dir %>"
+    #"^<%= Pod::Config::Environment.instance.project_root %>"
+    #"^<%= Pod::Config::Environment.instance.repos_dir %>"
     #"^/Users/[^.]+/Library/Caches/CocoaPods/*"
     #"^/dev/tty"
     #"^/private/var"

lib/cocoapods/command.rb

@@ -23,7 +23,7 @@ module Pod
     require 'cocoapods/command/spec'
     require 'cocoapods/command/init'
 
-    include Pod::Config::Manager
+    include Pod::Config
 
     self.abstract_command = true
     self.default_subcommand = 'install'

lib/cocoapods/command/config.rb

@@ -17,7 +17,7 @@ module Pod
     #
     class Config < Command
 
-      include Pod::Config::Manager
+      include Pod::Config
 
       self.summary = 'Something like `bundle config` ... but better.'
       self.description = <<-DESC

lib/cocoapods/config.rb

@@ -9,32 +9,27 @@ module Pod
   #
   module Config
 
-    autoload :ConfigManager, 'cocoapods/config/config_manager'
-    autoload :ConfigEnvironment, 'cocoapods/config/environment'
-
+    autoload :Manager, 'cocoapods/config/config_manager'
+    autoload :Environment, 'cocoapods/config/environment'
 
     # Provides support for accessing the configuration manager
     # instance in other scopes.
     #
-    module Manager
-      def config
-        ConfigManager.instance
-      end
+    def config
+      Manager.instance
     end
 
     # Provides support for accessing the environment instance in other
     # scopes.
     #
-    module Environment
-      def environment
-        ConfigEnvironment.instance
-      end
+    def environment
+      Environment.instance
     end
 
     public
 
-    extend Environment
-    extend Manager
+    #extend Environment
+    #extend Manager
     #-------------------------------------------------------------------------#
 
     # @!group Dependency Injection

lib/cocoapods/config/config_manager.rb

@@ -7,7 +7,7 @@ module Pod
     # The config manager is responsible for reading and writing the config.yaml
     # file. 
     # 
-    class ConfigManager
+    class Manager
 
 
       # The default settings for the configuration.
@@ -106,7 +106,7 @@ module Pod
       # @return [Pathname] The path of the file which contains the user settings.
       #
       def global_config_filepath
-        Config::ConfigEnvironment.instance.home_dir + "config.yaml"
+        Config::Environment.instance.home_dir + "config.yaml"
       end
 
       def local_config_filepath

lib/cocoapods/config/environment.rb

@@ -7,7 +7,7 @@ module Pod
     # The config manager is responsible for reading and writing the config.yaml
     # file. 
     # 
-    class ConfigEnvironment
+    class Environment
 
       # @!group Singleton
 

lib/cocoapods/executable.rb

@@ -13,7 +13,7 @@ module Pod
   #
   module Executable
 
-    extend Pod::Config::Manager
+    extend Pod::Config
 
     # Creates the methods for the executable with the given name.
     #

lib/cocoapods/installer.rb

@@ -36,8 +36,7 @@ module Pod
     autoload :PodTargetInstaller,       'cocoapods/installer/target_installer/pod_target_installer'
     autoload :UserProjectIntegrator,    'cocoapods/installer/user_project_integrator'
 
-    include Config::Manager
-    include Config::Environment
+    include Config
 
 
     # @return [Sandbox] The sandbox where the Pods should be installed.

lib/cocoapods/installer/analyzer.rb

@@ -6,8 +6,7 @@ module Pod
     #
     class Analyzer
 
-      include Config::Manager
-      include Config::Environment
+      include Config
 
       autoload :SandboxAnalyzer, 'cocoapods/installer/analyzer/sandbox_analyzer'
 

lib/cocoapods/sources_manager.rb

@@ -6,8 +6,7 @@ module Pod
 
     class << self
 
-      include Config::Manager
-      include Config::Environment
+      include Config
 
       # @return [Source::Aggregate] the aggregate of all the sources known to
       #         this installation of CocoaPods.

lib/cocoapods/user_interface.rb

@@ -17,8 +17,7 @@ module Pod
 
     class << self
 
-      include Config::Manager
-      include Config::Environment
+      include Config
 
       attr_accessor :indentation_level
       attr_accessor :title_level

lib/cocoapods/validator.rb

@@ -11,8 +11,7 @@ module Pod
   #
   class Validator
 
-    include Config::Manager
-    include Config::Environment
+    include Config
 
     # @return [Specification::Linter] the linter instance from CocoaPods
     #         Core.

spec/functional/command/config_spec.rb

@@ -15,7 +15,7 @@ module Pod
 
     before do
       FileUtils.rm_rf(@config_file_path)
-      @subject = Config::ConfigManager.new
+      @subject = Config::Manager.new
       # TODO: stub the file accessor
     end
 

spec/spec_helper.rb

@@ -79,8 +79,7 @@ Bacon.summary_at_exit
 
 module Bacon
   class Context
-    include Pod::Config::Manager
-    include Pod::Config::Environment
+    include Pod::Config
     include SpecHelper::Fixture
     include SpecHelper::Command
 

spec/unit/config/config_manager_spec.rb

@@ -3,7 +3,7 @@ require 'yaml'
 
 module Pod
 
-  describe Config::ConfigManager do
+  describe Config::Manager do
 
     describe "global" do
 
@@ -11,11 +11,11 @@ module Pod
 
       before do
         FileUtils.rm_rf(@config_file_path)
-        @subject = Config::ConfigManager.new
+        @subject = Config::Manager.new
       end
 
       it "has a singleton" do
-        Config::ConfigManager.instance.should === Config::ConfigManager.instance
+        Config::Manager.instance.should === Config::Manager.instance
       end
 
       it "creates a global config file if one didn't exist" do

spec/unit/config/environment_spec.rb

@@ -2,9 +2,9 @@ require File.expand_path('../../../spec_helper', __FILE__)
 
 module Pod
 
-  describe Config::ConfigEnvironment do
+  describe Config::Environment do
     before do
-      @sut = Config::ConfigEnvironment.new
+      @sut = Config::Environment.new
     end
 
     describe "In general" do