Removing RubyGems inclusion

googleads · Feb 8, 2012 · 5b1e87c · 5b1e87c
1 parent b974cab
commit 5b1e87c
Show file tree

Hide file tree

Showing 752 changed files with 8,869 additions and 699 deletions.
diff --git a/ads_common/ChangeLog b/ads_common/ChangeLog
@@ -1,6 +1,7 @@
 0.6.3:
   - Support for CAPTCHA challenge handling.
   - Added .gemspec and updated packaging process.
+  - Removed explicit require for RubyGems.
 
 0.6.2:
   - Requiring Savon as "~>" now.

diff --git a/ads_common/lib/ads_common/config.rb b/ads_common/lib/ads_common/config.rb
@@ -20,7 +20,6 @@
 # Configuration handler, can load data from a YAML configuration file and
 # rewrite it in memory.
 
-require 'rubygems'
 require 'yaml'
 
 require 'ads_common/errors'

diff --git a/ads_common/test/test_client_login_handler.rb b/ads_common/test/test_client_login_handler.rb
@@ -20,7 +20,6 @@
 #
 # Tests client login handler methods.
 
-require 'rubygems'
 require 'test/unit'
 
 require 'ads_common/config'

diff --git a/ads_common/test/test_config.rb b/ads_common/test/test_config.rb
@@ -20,8 +20,8 @@
 #
 # Tests the array replies from services.
 
-require 'rubygems'
 require 'test/unit'
+
 require 'ads_common/config'
 
 class TestConfig < Test::Unit::TestCase

diff --git a/ads_common/test/test_parameters_validator.rb b/ads_common/test/test_parameters_validator.rb
@@ -20,7 +20,6 @@
 #
 # Tests validator methods.
 
-require 'rubygems'
 require 'test/unit'
 
 require 'ads_common/errors'

diff --git a/ads_common/test/test_savon_service.rb b/ads_common/test/test_savon_service.rb
@@ -20,7 +20,6 @@
 #
 # Tests the array replies from services.
 
-require 'rubygems'
 require 'test/unit'
 
 require 'ads_common/config'

diff --git a/adwords_api/ChangeLog b/adwords_api/ChangeLog
@@ -2,6 +2,7 @@
   - Require google-ads-common 0.6.3 or later from now on.
   - Support for CAPTCHA challenge handling.
   - Added .gemspec and updated packaging process.
+  - Removed explicit require for RubyGems, see README.
 
 0.5.0:
   - Removed deprecated API versions (pre-v201109).

diff --git a/adwords_api/README b/adwords_api/README
@@ -33,25 +33,16 @@ The following gem libraries are required:
 
 == 2 - Using the client library:
 
-It's pretty easy to use.
+Include the library with 'require':
-See http://docs.rubygems.org/read/chapter/3#page70 for how to set the rubygem
-environment.
-   $ export RUBYOPT=rubygems
-or
-   $ ruby -rubygems my_program_that_uses_gems
-
-If you are running Ruby 1.8 and do not use the rubygems option, you need to add
-   require 'rubygems'
-at the beginning of your programs.
-
-Then:
-   gem 'google-adwords-api'
    require 'adwords_api'
 
+Then create an API instance:
    adwords = AdwordsApi::Api.new
-creates an Api object that will grant you access to all the services for all of
+
-the currently supported vesions of the APIs. It uses a config file in:
+The created API object will grant you access to all the services for all of the
-ENV['HOME']/adwords_api.yml to read all of your configurations.
+currently supported vesions of the APIs. It uses a config file in:
+  ENV['HOME']/adwords_api.yml to read all of your configurations by default.
+
 There is an example configuration file shipped with these libraries.
 
 You can also pass API a manually constructed config hash like:
@@ -85,6 +76,17 @@ please set the appropriate options in the config file or config hash. E.g.:
      :proxy => 'http://user:password@proxy_hostname:8080'
    }
 
+*Note*: if you are using Ruby 1.8 you may need to include RubyGems to be able
+to require other gems code. There are several ways to do it, the easiest one is
+to pass '-rubygems' parameter to the ruby interpreter:
+   $ ruby -rubygems my_program_that_uses_gems
+
+you can also set this up in the environment:
+   $ export RUBYOPT="rubygems"
+
+or add it to the bash configuration file:
+   $ echo 'export RUBYOPT="rubygems"' >> ~/.bashrc
+
 
 === 2.1 - Ruby names for a Ruby library:
 

diff --git a/adwords_api/Rakefile b/adwords_api/Rakefile
@@ -19,14 +19,15 @@
 #
 # AdWords API Rakefile.
 
-require 'rubygems'
+lib = File.expand_path('../lib/', __FILE__)
-require './lib/adwords_api/api_config'
+$:.unshift lib unless $:.include?(lib)
-require './lib/adwords_api/extensions'
 
 # Google common ads library used for wrapper code generation.
-gem 'google-ads-common'
 require 'ads_common/build/savon_generator'
 
+require 'adwords_api/api_config'
+require 'adwords_api/extensions'
+
 desc 'Default target - generate and build.'
 task :default => [:generate, :build]
 

diff --git a/adwords_api/examples/v201109/account_management/create_account.rb b/adwords_api/examples/v201109/account_management/create_account.rb
@@ -23,7 +23,6 @@
 #
 # Tags: CreateAccountService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 require 'adwords_api/utils'
 

diff --git a/adwords_api/examples/v201109/account_management/get_account_alerts.rb b/adwords_api/examples/v201109/account_management/get_account_alerts.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AlertService.get
 
-require 'rubygems'
 require 'adwords_api'
 require 'adwords_api/utils'
 

diff --git a/adwords_api/examples/v201109/account_management/get_account_changes.rb b/adwords_api/examples/v201109/account_management/get_account_changes.rb
@@ -23,7 +23,6 @@
 #
 # Tags: CustomerSyncService.get
 
-require 'rubygems'
 require 'adwords_api'
 require 'date'
 require 'pp'

diff --git a/adwords_api/examples/v201109/account_management/get_account_hierarchy.rb b/adwords_api/examples/v201109/account_management/get_account_hierarchy.rb
@@ -23,7 +23,6 @@
 #
 # Tags: ServicedAccountService.get
 
-require 'rubygems'
 require 'adwords_api'
 require 'adwords_api/utils'
 

diff --git a/adwords_api/examples/v201109/account_management/get_client_customer_id.rb b/adwords_api/examples/v201109/account_management/get_client_customer_id.rb
@@ -24,7 +24,6 @@
 #
 # Tags: InfoService.get
 
-require 'rubygems'
 require 'adwords_api'
 require 'adwords_api/utils'
 

diff --git a/adwords_api/examples/v201109/account_management/get_client_unit_usage.rb b/adwords_api/examples/v201109/account_management/get_client_unit_usage.rb
@@ -23,7 +23,6 @@
 #
 # Tags: InfoService.get
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/add_ad_group.rb b/adwords_api/examples/v201109/basic_operations/add_ad_group.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/add_campaign.rb b/adwords_api/examples/v201109/basic_operations/add_campaign.rb
@@ -22,7 +22,6 @@
 #
 # Tags: CampaignService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/add_keywords.rb b/adwords_api/examples/v201109/basic_operations/add_keywords.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupCriterionService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/add_text_ads.rb b/adwords_api/examples/v201109/basic_operations/add_text_ads.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupAdService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/delete_ad.rb b/adwords_api/examples/v201109/basic_operations/delete_ad.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupAdService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/delete_ad_group.rb b/adwords_api/examples/v201109/basic_operations/delete_ad_group.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/delete_campaign.rb b/adwords_api/examples/v201109/basic_operations/delete_campaign.rb
@@ -23,7 +23,6 @@
 #
 # Tags: CampaignService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/delete_keyword.rb b/adwords_api/examples/v201109/basic_operations/delete_keyword.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupCriterionService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/get_ad_groups.rb b/adwords_api/examples/v201109/basic_operations/get_ad_groups.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupService.get
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/get_campaigns.rb b/adwords_api/examples/v201109/basic_operations/get_campaigns.rb
@@ -22,7 +22,6 @@
 #
 # Tags: CampaignService.get
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/get_keywords.rb b/adwords_api/examples/v201109/basic_operations/get_keywords.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupCriterionService.get
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/get_text_ads.rb b/adwords_api/examples/v201109/basic_operations/get_text_ads.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupAdService.get
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/pause_ad.rb b/adwords_api/examples/v201109/basic_operations/pause_ad.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupAdService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/update_ad_group.rb b/adwords_api/examples/v201109/basic_operations/update_ad_group.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/update_campaign.rb b/adwords_api/examples/v201109/basic_operations/update_campaign.rb
@@ -23,7 +23,6 @@
 #
 # Tags: CampaignService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/basic_operations/update_keyword.rb b/adwords_api/examples/v201109/basic_operations/update_keyword.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupCriterionService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/campaign_management/add_experiment.rb b/adwords_api/examples/v201109/campaign_management/add_experiment.rb
@@ -26,7 +26,6 @@
 #
 # Tags: ExperimentService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/campaign_management/add_keywords_in_bulk.rb b/adwords_api/examples/v201109/campaign_management/add_keywords_in_bulk.rb
@@ -24,7 +24,6 @@
 # Tags: MutateJobService.mutate, MutateJobService.get,
 #       MutateJobService.getResult
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/campaign_management/add_location_extension.rb b/adwords_api/examples/v201109/campaign_management/add_location_extension.rb
@@ -23,7 +23,6 @@
 #
 # Tags: GeoLocationService.get, CampaignAdExtensionService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/campaign_management/add_location_extension_override.rb b/adwords_api/examples/v201109/campaign_management/add_location_extension_override.rb
@@ -24,7 +24,6 @@
 #
 # Tags: AdExtensionOverrideService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/campaign_management/get_all_disapproved_ads.rb b/adwords_api/examples/v201109/campaign_management/get_all_disapproved_ads.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupAdService.get
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/campaign_management/promote_experiment.rb b/adwords_api/examples/v201109/campaign_management/promote_experiment.rb
@@ -23,7 +23,6 @@
 #
 # Tags: ExperimentService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/campaign_management/set_ad_parameters.rb b/adwords_api/examples/v201109/campaign_management/set_ad_parameters.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupAdService.mutate, AdParamService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/campaign_management/validate_text_ad.rb b/adwords_api/examples/v201109/campaign_management/validate_text_ad.rb
@@ -23,7 +23,6 @@
 #
 # Tags: CampaignService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/error_handling/handle_captcha_challenge.rb b/adwords_api/examples/v201109/error_handling/handle_captcha_challenge.rb
@@ -23,7 +23,6 @@
 #
 # http://code.google.com/apis/adwords/docs/guides/bestpractices.html#auth_tokens
 
-require 'rubygems'
 require 'adwords_api'
 
 API_VERSION = :v201109

diff --git a/adwords_api/examples/v201109/error_handling/handle_partial_failures.rb b/adwords_api/examples/v201109/error_handling/handle_partial_failures.rb
@@ -22,7 +22,6 @@
 #
 # Tags: AdGroupCriterionService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 require 'adwords_api/utils'
 

diff --git a/adwords_api/examples/v201109/error_handling/handle_policy_violation_error.rb b/adwords_api/examples/v201109/error_handling/handle_policy_violation_error.rb
@@ -23,7 +23,6 @@
 #
 # Tags: AdGroupAdService.mutate
 
-require 'rubygems'
 require 'adwords_api'
 require 'adwords_api/utils'