terrimporter 0.7.4 → 0.7.5

data/lib/terrimporter.rb

@@ -19,6 +19,12 @@ require 'fileutils'
 require 'yaml'
 require 'uri'
 
+STAT.add_message(:download, "total files downloaded")
+STAT.add_message(:css, "stylesheets downloaded")
+STAT.add_message(:js, "javascripts downloaded")
+STAT.add_message(:image, "images downloaded")
+STAT.add_message(:module, "html modules downloaded")
+
 module TerrImporter
   class Application
     class << self

data/lib/terrimporter/configuration_loader.rb

@@ -52,30 +52,36 @@ module TerrImporter
       end
 
       def determine_configuration_values_from_html(raw_html)
-        css_result, js_result = raw_html.scan(/(\/terrific\/base\/(.*?)\/public\/.*base.(css|js).php)\?.*application=(.*?)(&|&)/)
+        #todo this regex does it wrong, it extracts all references and can't decide between js and css. also the version is wrongly extracted if the base path isn't correct
+        results = raw_html.scan(/(\/terrific\/base\/(.*?)\/public\/.*base.(css|js).php)\?.*application=(.*?)(&|&)/)
+        results.uniq!
+
+        css_result =results.select{|v| v[2] == "css"}.first
+        js_result =results.select{|v| v[2] == "js"}.first
+
 
-        raise ConfigurationError, "Unable to extract css information from application url, content is: #{raw_html}" if css_result.nil? or css_result.size < 5
         raise ConfigurationError, "Unable to extract javascript information from application url, content is: #{raw_html}" if js_result.nil? or js_result.size < 5
 
         css_export_path = css_result[0]
         js_export_path = js_result[0]
-        terrific_version = css_result[1]
+        terrific_version = css_result[1]     #todo: if it looks like this tags/0.4.0 -> extract number, remove everything before and inclusive /
         application = css_result[3]
 
-        raise ConfigurationError, "Unable to determine css export path" if css_export_path.nil?
-        raise ConfigurationError, "Unable to determine js export path " if js_export_path.nil?
-        raise ConfigurationError, "Unable to determine terrific version" if terrific_version.nil?
-        raise ConfigurationError, "Unable to determine application path" if application.nil?
+        case nil
+          when css_export_path
+            raise ConfigurationError, "Unable to determine css export path"
+          when js_export_path
+            raise ConfigurationError, "Unable to determine js export path"
+          when terrific_version
+            raise ConfigurationError, "Unable to determine terrific version"
+          when application
+            raise ConfigurationError, "Unable to determine application path"
+        end
 
         LOG.info "Determined the following configuration values:\n" +
                      "terrific version: #{terrific_version} \n" +
                      "application path: #{application}"
 
-        #self['version'] = terrific_version
-        #self['export_settings'] ||= {}
-        #self['export_settings']['application'] = application
-        #self['css_export_path'] = css_export_path
-        #self['js_export_path'] = js_export_path
         [terrific_version, application, css_export_path, js_export_path]
       end
 

data/lib/terrimporter/downloader.rb

@@ -18,10 +18,10 @@ module TerrImporter
             download_to_buffer(remote_url)
           else
             download_to_file(remote_url, local_path)
-            STAT.add(:download, 1)
+            STAT.add(:download)
           end
         rescue Exception => e
-          raise DefaultError, "Error opening url: #{remote_url}"
+          raise DefaultError, "Error opening url: #{remote_url}, message: #{e.message}"
         end
       end
 
@@ -38,7 +38,7 @@ module TerrImporter
         open(local_path, "wb") { |file| file.write(remote_url.open.read) }
       end
 
-      def batch_download(remote_path, local_path, type_filter = "")
+      def batch_download(remote_path, local_path, type_filter = "", statistics_key = nil)
         source_path = url(remote_path)
         create_directory local_path
         LOG.debug "Download multiple files from #{source_path} to #{local_path} #{"allowed extensions: " + type_filter unless type_filter.empty?}"
@@ -54,6 +54,7 @@ module TerrImporter
         files.each do |file|
           local_file_path = File.join(local_path.to_s, file)
           self.download(File.join(source_path.to_s, file), local_file_path)
+          STAT.add(statistics_key) unless statistics_key.nil?
         end
       end
 

data/lib/terrimporter/importer.rb

@@ -55,7 +55,7 @@ module TerrImporter
           unclean_file_path = file_path + unclean_suffix;
           constructed_file_path = (config.replace_style_strings? ? unclean_file_path : file_path)
           @downloader.download(source_url, constructed_file_path)
-
+          STAT.add(:css)
           if file_contains_valid_css?(constructed_file_path)
             if config.replace_style_strings?
               LOG.info "CSS line replacements"
@@ -88,7 +88,7 @@ module TerrImporter
         js_source_url = export_path(:js)
         LOG.debug "Import base.js from #{js_source_url} to #{file_path}"
         @downloader.download(js_source_url, file_path)
-
+        STAT.add(:js)
         if config.has_dynamic_javascripts?
           if config.libraries_server_path.nil?
             LOG.info "Define 'libraries_server_path' in configuration file"
@@ -98,6 +98,7 @@ module TerrImporter
             js_libraries = config.dynamic_libraries
             js_libraries.each do |lib|
               @downloader.download(File.join(config.libraries_server_path, lib), File.join(libraries_file_path, lib))
+              STAT.add(:js)
             end
           end
         end
@@ -111,6 +112,7 @@ module TerrImporter
           js_plugins = config.dynamic_plugins
           js_plugins.each do |lib|
             @downloader.download(File.join(config.plugins_server_path, lib), File.join(plugins_file_path, lib))
+            STAT.add(:js)
           end
             end
         end
@@ -122,7 +124,7 @@ module TerrImporter
           LOG.info "Import images"
           config.images.each do |image|
             image_source_path = File.join(config.images_server_path, image['server_path'])
-            @downloader.batch_download(image_source_path, image['destination_path'], image['file_types'])
+            @downloader.batch_download(image_source_path, image['destination_path'], image['file_types'], :image)
           end
         else
           LOG.debug "Skipping image import"
@@ -140,6 +142,7 @@ module TerrImporter
             filename = name.clone
             filename << "_#{skin}" unless skin.to_s.strip.length == 0
             @downloader.download(module_source_url, File.join(mod['destination_path'], filename + '.html'))
+            STAT.add(:module)
           end
         else
           LOG.debug "Skipping module import"
@@ -163,7 +166,7 @@ module TerrImporter
         export_settings.merge!(options)
         export_settings['appbaseurl'] = "" if for_what == :css
 
-        export_path = for_what == :js ? config.js_export_path.clone : config.css_export_path.clone
+        export_path = (for_what == :js) ? config.js_export_path.clone : config.css_export_path.clone
         export_path << '?' << export_settings.map { |k, v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join("&")
         export_path
       end

data/lib/terrimporter/statistic.rb

@@ -2,25 +2,22 @@ class Statistic
   attr_accessor :statistics, :times
 
   def initialize
-    @header = ["-------------------------------",
-               " SUMMARY ",
-               "-------------------------------"]
-
-    self.statistics = {
-        :download => {:count => 0, :message => ""},
-        :js => {:count => 0, :message => ""},
-        :css => {:count => 0, :message => ""},
-        :image => {:count => 0, :message => ""},
-        :error => {:count => 0, :message => ""}
-    }
+    @header = ["---SUMMARY Date: #{Time.now.strftime("%d.%m.%Y %H:%M:%S")}" ]
+    self.statistics = {}
   end
 
   def add_message(type, message)
+    init_data(type)
     self.statistics[type][:message] = message
   end
 
-  def add(type, count)
-    self.statistics[type][:count] += count
+  def add(type)
+    init_data(type)
+    self.statistics[type][:count] += 1
+  end
+
+  def init_data(type)
+    self.statistics[type] = {:count => 0, :message => ""} if self.statistics[type].nil?
   end
 
   def print_summary
@@ -28,7 +25,8 @@ class Statistic
       puts h
     end
     self.statistics.each do |key, value|
-      puts "#{key.to_s.upcase}: [#{value[:count]}] #{value[:message]}" unless value[:count] == 0
+
+      puts "* %3s : %s" % [value[:count], value[:message]] unless value[:count] == 0
     end
   end
 

data/lib/terrimporter/version.rb

@@ -1,4 +1,4 @@
-#Generated by rake task, last bump: minor7patch4major0
+#Generated by rake task, last bump: minor7patch5major0
 module TerrImporter
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/test/unit/test_statistics.rb

@@ -7,13 +7,13 @@ class StatisticTest < Test::Unit::TestCase
 end
 
   should 'add an entry to the statistic' do
-    @stat.add(:download, 1)
+    @stat.add(:download)
     assert @stat.statistics[:download][:count] == 1
   end
 
   should 'update an entry in the statistics' do
-    @stat.add(:download, 1)
-    @stat.add(:download, 1)
+    @stat.add(:download)
+    @stat.add(:download)
     assert @stat.statistics[:download][:count] == 2
   end
 
@@ -30,9 +30,9 @@ end
 
   should 'output the messages added' do
     @stat.add_message(:download, "Downloads")
-    @stat.add(:download, 1)
+    @stat.add(:download)
     @stat.add_message(:css, "CSS")
-    @stat.add(:css, 1)
+    @stat.add(:css)
 
     out = capture_stdout do
       @stat.print_summary

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terrimporter
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Daniel Kummer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 Z
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kwalify