sem4r 0.1.2 → 0.1.3

data/lib/sem4r.rb

@@ -22,25 +22,40 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # -------------------------------------------------------------------
 
+#
+# stdlib
+#
 require 'yaml'
 require 'pathname'
+require 'ostruct'
+require 'uri'
+require 'pp'
+require 'logger'
+require 'fileutils'
+# require 'rexml/document'
 
+#
 # use bundler
+#
 require "rubygems"
-require "bundler/setup"
+
+begin
+  require "bundler/setup"
+rescue LoadError
+end
 
 require 'builder'
-# require 'rexml/document'
 require 'nokogiri'
-require 'uri'
-require 'pp'
-require 'logger'
-require 'fileutils'
+
+if RUBY_PLATFORM =~ /java/
+  gem 'jruby-openssl'
+  require 'openssl'
+end
 
 module Sem4r #:nodoc:
   def self.version
-    cwd = Pathname(__FILE__).dirname.expand_path.to_s
-    yaml = YAML.load_file(cwd + '/../VERSION.yml')
+    cwd   = Pathname(__FILE__).dirname.expand_path.to_s
+    yaml  = YAML.load_file(cwd + '/../VERSION.yml')
     major = (yaml['major'] || yaml[:major]).to_i
     minor = (yaml['minor'] || yaml[:minor]).to_i
     patch = (yaml['patch'] || yaml[:patch]).to_i
@@ -56,32 +71,19 @@ require 'sem4r/extensions.rb'
 require 'sem4r/adwords'
 require 'sem4r/credentials'
 require 'sem4r/sem4r_error'
-require 'soap_helpers/soap_attributes'
+require 'sem4r_soap/soap_attributes'
 
 require 'sem4r/base'
 require 'sem4r/account'
 
 require 'sem4r/bulk_mutate_job/bulk_mutate_job_account_extension'
 require 'sem4r/campaign/campaign_account_extension'
-require 'sem4r/geo_location/geo_location_account_extension'
 require 'sem4r/info/info_account_extension'
 require 'sem4r/report_definition/report_definition_account_extension'
 require 'sem4r/targeting_idea/targeting_idea_account_extension'
 
-require 'sem4r/v13_report/report_account_extension'
-require 'sem4r/v13_account/account_account_extension'
-
-#
-# soap connection layer
-#
-require 'sem4r/services/soap_error'
-require 'sem4r/services/http_connector'
-require 'sem4r/services/soap_dumper'
-require 'sem4r/services/soap_connector'
-require 'sem4r/services/soap_message_v13'
-require 'sem4r/services/soap_message_v2010'
-require 'sem4r/services/soap_call'
-require 'sem4r/services/service'
+require 'sem4r_soap'
+require 'sem4r/service'
 
 #
 # common
@@ -134,7 +136,22 @@ require 'sem4r/campaign/campaign'
 #
 # info
 #
-require'sem4r/info/info_selector'
+require 'sem4r/info/info_selector'
+
+#
+# geo_location
+#
+require 'sem4r/geo_location/geo_location_account_extension'
+require 'sem4r/geo_location/geo_location_selector'
+require 'sem4r/geo_location/address'
+
+#
+# report_definition
+#
+require 'sem4r/report_definition/report_definition'
+require 'sem4r/report_definition/report_field'
+require 'sem4r/report_definition/report_definition_selector'
+require 'sem4r/report_definition/report_definition_operation'
 
 #
 # targeting_idea
@@ -146,18 +163,16 @@ require 'sem4r/targeting_idea/targeting_idea_selector'
 # v13_account
 #
 require 'sem4r/v13_account/billing_address'
+require 'sem4r/v13_account/account_account_extension'
 
 #
 # v13_report
 #
 require 'sem4r/v13_report/report'
 require 'sem4r/v13_report/report_job'
-
+require 'sem4r/v13_report/report_account_extension'
 
 #
-# report_definition
 #
-require 'sem4r/report_definition/report_definition'
-require 'sem4r/report_definition/report_field'
-require 'sem4r/report_definition/report_definition_selector'
-require 'sem4r/report_definition/report_definition_operation'
+#
+require 'sem4r/sem4r_templates'

data/lib/{sem4r/cli → sem4r_cli}/cli_helpers.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-module Sem4r
+module Sem4rCli
+  
   # From http://gist.github.com/72234
   #
   # mysql-style output for an array of ActiveRecord objects
@@ -21,7 +22,7 @@ module Sem4r
   # +------+-----------+--------------------------------+
   # 5 rows in set
   #
-  def self.report(items, *fields)
+  def self.report(items, *fields) #:nodoc: all
     # find max length for each field; start with the field names themselves
     max_len = Hash[*fields.map {|f| [f, f.to_s.length]}.flatten]
 

data/lib/{sem4r/cli/cli_command.rb → sem4r_cli/cli_mini_framework.rb}

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-# -------------------------------------------------------------------------
+# -------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -20,20 +20,50 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
-# -------------------------------------------------------------------------
+# -------------------------------------------------------------------
 
-module Sem4r
+module Sem4rCli
 
+  class Cli
+    def self.run
+      cli = self.new
+      cli.parse_and_run(ARGV)
+    end
+  end
+
+  #
+  # Base class for generic command
+  # @example
+  #   class MyCommand < CliCommand
+  #     def self.command;     "mycommand"; end
+  #     def self.description; "mycomand description"; end
+  #
+  #     def initialize(common_args)
+  #       ...
+  #     end
+  #
+  #     def parse_and_run(args)
+  #        ...
+  #       if run_successful then true else false end
+  #     end
+  #   end
+  #
   class CliCommand
 
     class << self
 
+      #
+      # @private
+      # Add class to the list of command.
+      #
       def inherited(base)
         @command_list ||= []
         @command_list << base
       end
 
+      #
+      # All definited commands
+      #
       def commands
         return @commands if @commands
         @commands = {}
@@ -41,19 +71,38 @@ module Sem4r
         @commands
       end
 
-      def split_args(argv)
-        idx = argv.find_index { |e| commands.key?(e) }
-        if idx
-          common_args  = argv[0,idx]
-          command      = argv[idx]
-          command_args = argv[idx+1..-1]
-          return [common_args, command, command_args]
-        else
-          return [argv, nil, nil]
-        end
-      end
+      #
+      # Finds the name of command into args.
+      # If ARGV is <opt1> <opt2> command_name <rest of cli>
+      # @return[ ar1, name, ar2 ] where
+      #    ar1 is = <opt1> <opt2>
+      #    name is command_name
+      #    ar2 is = <rest of cli>
+      #
+      # def split_args(argv)
+      #   idx = argv.find_index { |e| commands.key?(e) }
+      #   if idx
+      #     common_args  = argv[0, idx]
+      #     command      = argv[idx]
+      #     command_args = argv[idx+1..-1]
+      #     [common_args, command, command_args]
+      #   else
+      #     [argv, nil, nil]
+      #   end
+      # end
 
-      def define_command(command_name, description_str, &block)
+      #
+      # Helper method to define new command
+      #
+      # @example
+      #   CliMyCommand = CliCommand.define_command("mycommand", "my command description") do |cli|
+      #     ...
+      #     <might access to cli methods as common options>
+      #     ...
+      #     if run_successful then true else false end
+      #   end
+      #
+      def define_command(command_name, description, &block)
 
         unless block_given?
           raise "define_command: missing block"
@@ -65,7 +114,7 @@ module Sem4r
           end
 
           def opt_parser(options)
-            opt_parser = OptionParser.new
+            opt_parser       = OptionParser.new
             opt_parser.banner= "#{self.class.description}"
             opt_parser.on("-h", "--help", "show this message") do
               puts opt_parser
@@ -75,28 +124,24 @@ module Sem4r
 
           define_method("parse_and_run") do |argv|
             options = OpenStruct.new
-            opt_parser(options).parse( argv )
+            opt_parser(options).parse(argv)
             return false if options.exit
-            account = @common_args.account
-            unless account
-              puts "select an account!"
-              false
-            else
-              return block.call(account)
-            end
+            block.call(@common_args)
           end
         end
 
-        s = class << cls; self; end
+        s   = class << cls;
+          self;
+        end
         s.class_eval do
           define_method("command") { command_name }
-          define_method("description") { description_str }
+          define_method("description") { description }
         end
         cls
       end
 
-    end
+    end # class << self
 
-  end
+  end # class CliCommand
 
 end