sem4r 0.1.3 → 0.1.5

data/Gemfile

@@ -1,22 +1,2 @@
-source :gemcutter
-
-gem "builder"
-gem "nokogiri"
-gem "httpclient"
-gem 'highline', :require => 'highline/import'
-
-group :development do
-  gem "jeweler"
-  gem "rake"
-  gem "yard"
-  gem "bundler"  # funny!
-end
-
-group :test do
-  gem "differ"
-  gem "rspec"
-end
-
-#platforms :jruby do
-#  gem 'jruby-openssl'
-#end
+source "http://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -1,42 +1,65 @@
+PATH
+  remote: .
+  specs:
+    sem4r (0.1.4)
+      builder
+      builder
+      haml
+      highline
+      httpclient
+      nokogiri
+      nokogiri
+      optparse-command (= 0.1.6)
+      signet
+      sinatra
+
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.4)
     builder (3.0.0)
     diff-lcs (1.1.2)
-    differ (0.1.1)
-    git (1.2.5)
+    differ (0.1.2)
+    haml (3.0.25)
     highline (1.6.1)
-    httpclient (2.1.5.2)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
+    httpadapter (0.2.1)
+      addressable (~> 2.2.0)
+    httpclient (2.1.6.1)
+    json (1.5.1)
+    json (1.5.1-java)
     nokogiri (1.4.4)
     nokogiri (1.4.4-java)
       weakling (>= 0.0.3)
+    optparse-command (0.1.6)
+    rack (1.2.1)
     rake (0.8.7)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
+    rspec-mocks (2.5.0)
+    signet (0.2.0)
+      addressable (~> 2.2.1)
+      httpadapter (~> 0.2.0)
+      json (~> 1.5.0)
+    sinatra (1.1.3)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.2.2)
     weakling (0.0.4-java)
-    yard (0.6.3)
+    yard (0.6.4)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  builder
+  bundler
   differ
-  highline
-  httpclient
-  jeweler
-  nokogiri
   rake
   rspec
+  sem4r!
   yard

data/Rakefile

@@ -1,9 +1,11 @@
 require 'rubygems'
 require 'rake'
 
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 # Load tasks
 Dir.glob('tasks/**/*.rake').each { |r| Rake.application.add_import r }
 
-task :test => :check_dependencies
+task :test => :spec
 task :default => :spec
-

data/bin/sem

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------
 # Copyright (c) 2009-2010 Sem4r sem4ruby@gmail.com
@@ -21,15 +21,11 @@
 # 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.
-# 
 # -------------------------------------------------------------------------
 
 require 'rubygems'
-
 cwd = File.expand_path( File.join( File.dirname(__FILE__), "..", "lib" ) )
 $:.unshift(cwd) unless $:.include?(cwd)
 require 'sem4r_cli'
 
-include Sem4r
-include Sem4rCli
-exit CliSem.run
+Sem4rCli::CliSem.run!

data/lib/sem4r/adwords.rb

@@ -22,7 +22,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # -------------------------------------------------------------------
 
-
 module Sem4r
   class Adwords
 
@@ -46,78 +45,6 @@ module Sem4r
         new("production", options)
       end
 
-      #
-      # @private
-      # Search configuration file in standard locations
-      # @return [OpenStruct] with
-      #       :config_dir
-      #       :config_file
-      #       :password_file
-      #
-      def search_config
-        config_filename   = "sem4r.yml"
-        password_filename = "sem4r_passwords.yml"
-
-        #
-        # try current directory
-        #
-        # return File.expand_path(config_filename) if File.exists?( config_filename)
-
-        #
-        # try ~/.sem4r/sem4r.yml
-        #
-        # require 'etc'
-        # homedir = Etc.getpwuid.dir
-        homedir           = ENV['HOME']
-        config_filepath   = File.join(homedir, ".sem4r", config_filename)
-        if File.exists?(config_filepath)
-          return OpenStruct.new(
-              :config_dir    => File.join(homedir, ".sem4r"),
-              :config_file   => config_filepath,
-              :password_file => File.join(homedir, ".sem4r", password_filename))
-        end
-
-        #
-        # try <home_sem4r>/config/sem4r
-        #
-        config_filepath = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", config_filename))
-        if File.exists?(config_filepath)
-          return OpenStruct.new(
-              :config_dir    => nil,
-              :config_file   => config_filepath,
-              :password_file => nil)
-        end
-
-        config_filepath = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", "sem4r.example.yml"))
-        if File.exists?(config_filepath)
-          return OpenStruct.new(
-              :config_dir    => nil,
-              :config_file   => config_filepath,
-              :password_file => nil)
-        end
-
-        OpenStruct.new(
-            :config_dir    => nil,
-            :config_file   => nil,
-            :password_file => nil)
-      end
-
-      #
-      # Return list of profile contained into config file
-      #
-      def profiles(profile_file = nil)
-        unless profile_file
-          config = search_config
-          unless config
-            raise Sem4rError, "config file 'sem4r' not found"
-          end
-          profile_file = config.config_file
-        end
-        # puts "Loaded profiles from #{profile_file}"
-        yaml     = YAML::load(File.open(profile_file))
-        profiles = yaml['google_adwords']
-        profiles
-      end
     end
 
     #
@@ -154,23 +81,23 @@ module Sem4r
 
         config_file   = options.delete("config_file")
         password_file = options.delete("password_file")
-        configure(config_file, password_file)
+        @config = Profile.configure(config_file, password_file)
 
         @profile = profile.to_s
-        @options = load_config(@profile)
+        @options = Profile.load_config(@config, @profile)
         @options = @options.merge(options)
       elsif profile.respond_to?(:keys)
         # new( {:environment=>"...", email => "..." } )
         options = profile.stringify_keys
         options.assert_valid_keys( *(all_keys-%w{config_file password_file}) )
-        configure
+        @config = Profile.configure
         @options = options
         @profile = "anonymous_" + @options["environment"]
       else
         # new( "sandbox" )
         @profile = profile.to_s
-        configure
-        @options = load_config(@profile)
+        @config = Profile.configure
+        @options = Profile.load_config(@config, @profile)
       end
       if ["sandbox", "production"].include?(profile)
         if @options["environment"].nil?
@@ -181,7 +108,7 @@ module Sem4r
         end
       end
 
-      try_to_find_password_in_password_file unless @options["password"]
+      Profile.try_to_find_in_password_file("password", @options, @config) unless @options["password"]
     end
 
     def to_s
@@ -192,7 +119,7 @@ module Sem4r
     # returns profiles contained into current config file
     #
     def profiles
-      self.class.profiles @config.config_file
+      Profile.profiles @config.config_file
     end
 
     #
@@ -200,7 +127,7 @@ module Sem4r
     #
     def config_file
       return @config.config_file if @config
-      @config = Adwords.search_config
+      @config = Profile.search_config
       unless @config
         puts "cannot find configuration files"
       end
@@ -227,67 +154,6 @@ module Sem4r
       @options["password"]=pwd
     end
 
-    def try_to_find_password_in_password_file
-      return unless @config.password_file
-      return unless File.exists?(@config.password_file)
-      passwords = YAML.load(File.open(@config.password_file))
-      pass = passwords[@options["email"]]
-      @options["password"] = pass if pass
-    end
-
-    def save_passwords
-      if @config.password_file.nil?
-        raise "cannot save password"
-      end
-      puts "save password in #{@config.password_file} (security warning!)"
-      passwords = {}
-      if File.exists?(@config.password_file)
-        passwords = YAML.load(File.open(@config.password_file))
-      end
-      passwords[@options["email"]] = @options["password"]
-      File.open(@config.password_file, "w") do |f|
-        f.write(passwords.to_yaml)
-      end
-    end
-
-    private
-
-    #
-    # @private
-    #
-    # force config paths
-    # and the config file
-    #
-    def configure(config_file = nil, password_file = nil)
-      @config = Adwords.search_config
-      unless config_file.nil?
-        config_file = File.expand_path(config_file)
-        unless File.exists?(config_file)
-          raise "#{config_file} not exists"
-        end
-        @config.config_file = config_file
-      end
-      unless password_file.nil?
-        password_file = File.expand_path(password_file)
-        @config.password_file = password_file
-      end
-      @config
-    end
-
-
-    # @private
-    # load the configuration
-    def load_config(profile)
-      unless @config.config_file
-        raise Sem4rError, "config file 'sem4r' not found"
-      end
-      # puts "Loaded profiles from #{config_file}"
-      yaml   = YAML::load(File.open(@config.config_file))
-      config = yaml['google_adwords'][profile]
-      config || {}
-    end
-
-    public
 
     ##########################################################################
     # logging

data/lib/sem4r/campaign/campaign_account_extension.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,7 +20,6 @@
 # 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
@@ -85,4 +84,4 @@ module Sem4r
     include AccountCampaignExtension
   end
 
-end
+end

data/lib/sem4r/profile.rb

@@ -0,0 +1,173 @@
+# -*- 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# 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
+
+  class Profile
+
+    attr_reader :profile
+
+    class << self
+
+      #
+      # @private
+      # Search configuration file in standard locations
+      # @return [OpenStruct] with
+      #       :config_dir
+      #       :config_file
+      #       :password_file
+      #
+      def search_config
+        config_filename = "sem4r.yml"
+        password_filename = "sem4r_passwords.yml"
+
+        #
+        # try current directory
+        #
+        # return File.expand_path(config_filename) if File.exists?( config_filename)
+
+        #
+        # try ~/.sem4r/sem4r.yml
+        #
+        # require 'etc'
+        # homedir = Etc.getpwuid.dir
+        homedir = ENV['HOME']
+        config_filepath = File.join(homedir, ".sem4r", config_filename)
+        if File.exists?(config_filepath)
+          return OpenStruct.new(
+              :config_dir => File.join(homedir, ".sem4r"),
+              :config_file => config_filepath,
+              :password_file => File.join(homedir, ".sem4r", password_filename))
+        end
+
+        #
+        # try <home_sem4r>/config/sem4r
+        #
+        config_filepath = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", config_filename))
+        if File.exists?(config_filepath)
+          return OpenStruct.new(
+              :config_dir => nil,
+              :config_file => config_filepath,
+              :password_file => nil)
+        end
+
+        config_filepath = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", "sem4r.example.yml"))
+        if File.exists?(config_filepath)
+          return OpenStruct.new(
+              :config_dir => nil,
+              :config_file => config_filepath,
+              :password_file => nil)
+        end
+
+        OpenStruct.new(
+            :config_dir => nil,
+            :config_file => nil,
+            :password_file => nil)
+      end
+
+      #
+      # Return list of profile contained into config file
+      #
+      def profiles(profile_file = nil)
+        unless profile_file
+          config = search_config
+          unless config
+            raise Sem4rError, "config file 'sem4r' not found"
+          end
+          profile_file = config.config_file
+        end
+        # puts "Loaded profiles from #{profile_file}"
+        yaml = YAML::load(File.open(profile_file))
+        profiles = yaml['google_adwords']
+        profiles
+      end
+
+      #
+      # @private
+      #
+      # force config paths
+      # and the config file
+      #
+      def configure(config_file = nil, password_file = nil)
+        config = Profile.search_config
+        unless config_file.nil?
+          config_file = File.expand_path(config_file)
+          unless File.exists?(config_file)
+            raise "#{config_file} not exists"
+          end
+          config.config_file = config_file
+        end
+        unless password_file.nil?
+          password_file = File.expand_path(password_file)
+          config.password_file = password_file
+        end
+        config
+      end
+
+      # @private
+      # load the configuration
+      def load_config(config, profile)
+        unless config.config_file
+          raise Sem4rError, "config file 'sem4r' not found"
+        end
+        # puts "Loaded profiles from #{config_file}"
+        yaml = YAML::load(File.open(config.config_file))
+        config = yaml['google_adwords'][profile.to_s]
+        config || {}
+      end
+
+      def try_to_find_in_password_file(key, options, config)
+        return unless config.password_file
+        return unless File.exists?(config.password_file)
+        passwords = YAML.load(File.open(config.password_file))
+        t = passwords[options["email"]]
+        if t and t[key]
+          options[key] = t[key]
+        else
+          nil
+        end
+      end
+
+      def save_passwords(key, options, config)
+        if config.password_file.nil?
+          raise "no password file defined"
+        end
+        # TODO: check permission password file
+        puts "save password in #{config.password_file} (security warning!)"
+        passwords = {}
+        if File.exists?(config.password_file)
+          passwords = YAML.load(File.open(config.password_file))
+        end
+        passwords[options["email"]] ||= {}
+        passwords[options["email"]][key] = options[key]
+        File.open(config.password_file, "w") do |f|
+          f.write(passwords.to_yaml)
+        end
+      end
+
+    end
+
+  end
+
+end # module Sem4r

data/lib/sem4r/sem4r_utilities.rb

@@ -0,0 +1,113 @@
+# -*- 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
+# without limitation the rights to use, copy, modify, merge, publish,
+# 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
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# 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
+
+  #def pretty_xml(xml)
+  #  normalized = Class.new(REXML::Formatters::Pretty) do
+  #    def write_text(node, output)
+  #      super(node.to_s.strip, output)
+  #    end
+  #  end
+  #  normalized.new(0, false).write(xml, xml_pretty='')
+  #  xml_pretty
+  #end
+
+  def self.pretty_print_xml_with_rexml(xml)
+    # TODO: using nokogiri also for pretty print xml ?
+    require 'rexml/document'
+    begin
+      xml_document = REXML::Document.new(xml)
+      f            = REXML::Formatters::Pretty.new
+      out          = String.new
+      f.write(xml_document, out)
+      # remove xml directive
+      out.gsub("<?xml version.rb='1.0' encoding='UTF-8'?>", "")
+    rescue
+      #    rescue RuntimeError
+      puts "----------------------------------"
+      puts xml
+      puts "----------------------------------"
+      raise
+    end
+    out
+  end
+
+  @_nokogiri_xsl =<<-EOFS
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="UTF-8" omit-xml-declaration="yes"/>
+  <xsl:param name="indent-increment" select="'   '"/>
+
+  <xsl:template name="newline">
+    <xsl:text disable-output-escaping="yes">
+</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="comment() | processing-instruction()">
+    <xsl:param name="indent" select="''"/>
+    <xsl:call-template name="newline"/>
+    <xsl:value-of select="$indent"/>
+    <xsl:copy />
+  </xsl:template>
+
+  <xsl:template match="text()">
+    <xsl:param name="indent" select="''"/>
+    <xsl:call-template name="newline"/>
+    <xsl:value-of select="$indent"/>
+    <xsl:value-of select="normalize-space(.)"/>
+  </xsl:template>
+
+  <xsl:template match="text()[normalize-space(.)='']"/>
+
+  <xsl:template match="*">
+    <xsl:param name="indent" select="''"/>
+    <xsl:call-template name="newline"/>
+    <xsl:value-of select="$indent"/>
+      <xsl:choose>
+       <xsl:when test="count(child::*) > 0">
+        <xsl:copy>
+         <xsl:copy-of select="@*"/>
+         <xsl:apply-templates select="*|text()">
+           <xsl:with-param name="indent" select="concat ($indent, $indent-increment)"/>
+         </xsl:apply-templates>
+         <xsl:call-template name="newline"/>
+         <xsl:value-of select="$indent"/>
+        </xsl:copy>
+       </xsl:when>
+       <xsl:otherwise>
+        <xsl:copy-of select="."/>
+       </xsl:otherwise>
+     </xsl:choose>
+  </xsl:template>
+</xsl:stylesheet>
+  EOFS
+
+  def self.pretty_print_xml_with_nokogiri(xml)
+    doc  = Nokogiri::XML(xml)
+    xslt = Nokogiri::XSLT(@_nokogiri_xsl)
+    out  = xslt.transform(doc).root.to_xml # using root omit the xml declaration
+    # out.gsub(/<\?xml version.rb=('|")1.0('|") encoding=('|")UTF-8('|")\?>/, "")
+  end
+
+end