spout 0.10.0.rc → 0.10.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e64b11b1ed504d3762a50fff88f41ddd8c6a0e
-  data.tar.gz: 89a27fd1331bd65e304947f9e33fb8ac2d913866
+  metadata.gz: 7449161615e7a639d91a56f1a7a0ad76305bd4aa
+  data.tar.gz: a3cf532e5429e49c7f8b5631cc89d183e748a257
 SHA512:
-  metadata.gz: 90b9c741347dc693b0e000a6eb6cbdb7e12bc05c457ccdeb7b28d44d9832e066f94ba879e34ed62f04901811699c6d4c71fb5e0f788c30cce95f9309ab68c1fe
-  data.tar.gz: 51864c2de09d2669dbd4e67ef3bc5cce498e2038d3b0bc63d3a7fa541cfaf88731212651a070fa3756f790aab65f3ddb25504762f3334ecbcbc8de7696373e82
+  metadata.gz: 1017da75474cb754296d88301fc6a2f81d3b0381dc23a38c0a7e39a322bf7c365af79876af3c792f6d3d02ab015c8671afaffb43b20d07e790f57bef1ed87e0c
+  data.tar.gz: 2f16bc92bd15d26d33307ab8aece2fe585922b5be8ac82f79cbb2ef4c9c12897ddd283e6f444065720608c4141ba282418cefdae2c9eb1335c1d368975c027c5

data/lib/spout/commands/deploy.rb

@@ -44,7 +44,7 @@ module Spout
       INDENT_LENGTH = 23
       INDENT = " "*INDENT_LENGTH
 
-      attr_accessor :token, :version, :slug, :url, :config, :environment
+      attr_accessor :token, :version, :slug, :url, :config, :environment, :webserver_name
 
       def initialize(argv, version)
         @environment = argv[1].to_s
@@ -105,6 +105,7 @@ module Spout
           failure(message)
         end
 
+        @webserver_name = matching_webservers.first['name'].to_s.strip rescue @webserver_name = ''
         @url = URI.parse(matching_webservers.first['url'].to_s.strip) rescue @url = nil
 
         if @url.to_s == ''
@@ -200,7 +201,7 @@ module Spout
         require 'spout/commands/graphs'
         argv = []
         argv << "--clean" if @clean
-        Spout::Commands::Graphs.new(argv, @version, true, @url, @slug, @token)
+        Spout::Commands::Graphs.new(argv, @version, true, @url, @slug, @token, @webserver_name)
         puts "\r     Graph Generation: " + "DONE          ".colorize(:green)
       end
 
@@ -209,7 +210,7 @@ module Spout
         require 'spout/commands/images'
         argv = []
         argv << "--clean" if @clean
-        Spout::Commands::Images.new([], [], [], @version, argv, true, @url, @slug, @token)
+        Spout::Commands::Images.new([], [], [], @version, argv, true, @url, @slug, @token, @webserver_name)
         puts "\r     Image Generation: " + "DONE          ".colorize(:green)
       end
 

data/lib/spout/commands/graphs.rb

@@ -17,12 +17,13 @@ require 'spout/version'
 module Spout
   module Commands
     class Graphs
-      def initialize(variables, standard_version, deploy_mode = false, url = '', slug = '', token = '')
+      def initialize(variables, standard_version, deploy_mode = false, url = '', slug = '', token = '', webserver_name = '')
         @deploy_mode = deploy_mode
         @url = url
         @standard_version = standard_version
         @slug = slug
         @token = token
+        @webserver_name = webserver_name
 
         argv = variables
 
@@ -109,7 +110,8 @@ module Spout
           end
 
           @progress[variable.id] ||= {}
-          next if (not @deploy_mode and @progress[variable.id]['generated'] == true) or (@deploy_mode and @progress[variable.id]['uploaded'] == true)
+          @progress[variable.id]['uploaded'] ||= []
+          next if (not @deploy_mode and @progress[variable.id]['generated'] == true) or (@deploy_mode and @progress[variable.id]['uploaded'].include?(@webserver_name))
 
           stats = {
             charts: {},
@@ -149,13 +151,12 @@ module Spout
 
           @progress[variable.id]['generated'] = true
 
-          if @deploy_mode and not @progress[variable.id]['uploaded'] == true
+          if @deploy_mode and not @progress[variable.id]['uploaded'].include?(@webserver_name)
             response = send_to_server(chart_json_file)
             if response.kind_of?(Hash) and response['upload'] == 'success'
-              @progress[variable.id]['uploaded'] = true
+              @progress[variable.id]['uploaded'] << @webserver_name
             else
               puts "\nUPLOAD FAILED: ".colorize(:red) + File.basename(chart_json_file)
-              @progress[variable.id]['uploaded'] = false
             end
           end
 

data/lib/spout/commands/images.rb

@@ -15,15 +15,17 @@ module Spout
   module Commands
     class Images
 
-      def initialize(types, variable_ids, sizes, standard_version, argv, deploy_mode = false, url = '', slug = '', token = '')
+      def initialize(types, variable_ids, sizes, standard_version, argv, deploy_mode = false, url = '', slug = '', token = '', webserver_name = '')
         @deploy_mode = deploy_mode
         @url = url
         @standard_version = standard_version
         @slug = slug
         @token = token
+        @webserver_name = webserver_name
 
 
-        @variable_files = Dir.glob('variables/**/*.json')
+        @dictionary_root = Dir.pwd
+        @variable_files = Dir.glob(File.join(@dictionary_root, 'variables', '**', '*.json'))
         @standard_version = standard_version
         @pretend = (argv.delete('--pretend') != nil)
         @clean = (argv.delete('--no-resume') != nil or argv.delete('--clean'))
@@ -74,27 +76,28 @@ module Spout
         variable_files_count = @variable_files.count
 
         @variable_files.each_with_index do |variable_file, file_index|
-          json = JSON.parse(File.read(variable_file)) rescue json = nil
-          next unless json
-          next unless @valid_ids.include?(json["id"].to_s.downcase) or @valid_ids.size == 0
-          next unless @types.include?(json["type"]) or @types.size == 0
-          next unless ["numeric", "integer", "choices"].include?(json["type"])
-          variable_name  = json['id'].to_s.downcase
-          next unless Spout::Models::Subject.method_defined?(variable_name)
+          variable = Spout::Models::Variable.new(variable_file, @dictionary_root)
+
+          next unless variable.errors.size == 0
+
+          next unless @valid_ids.include?(variable.id) or @valid_ids.size == 0
+          next unless @types.include?(variable.type) or @types.size == 0
+          next unless ["numeric", "integer", "choices"].include?(variable.type)
+          next unless Spout::Models::Subject.method_defined?(variable.id)
 
           if @deploy_mode
             print "\r     Image Generation: " + "#{"% 3d" % ((file_index+1)*100/variable_files_count)}% Uploaded".colorize(:white)
           else
-            puts "#{file_index+1} of #{variable_files_count}: #{variable_file.gsub(/(^variables\/|\.json$)/, '').gsub('/', ' / ')}"
+            puts "#{file_index+1} of #{variable_files_count}: #{variable.folder}#{variable.id}"
           end
 
-          @progress[variable_name] ||= {}
+          @progress[variable.id] ||= {}
+          @progress[variable.id]['uploaded'] ||= []
 
-          next if (not @deploy_mode and @progress[variable_name]['generated'] == true) or (@deploy_mode and @progress[variable_name]['uploaded'] == true)
+          next if (not @deploy_mode and @progress[variable.id]['generated'] == true) or (@deploy_mode and @progress[variable.id]['uploaded'].include?(@webserver_name))
 
           filtered_subjects = @subjects.select{ |s| s.send(@config.visit) != nil }
 
-          variable = Spout::Models::Variable.find_by_id variable_name
           graph = Spout::Models::Graphables.for(variable, chart_variable, nil, filtered_subjects)
 
           if graph.valid?
@@ -129,10 +132,12 @@ module Spout
                 }
               eos
             end
-            run_phantom_js(variable_name, "#{variable_name}-lg.png", 600, tmp_options_file) if @sizes.size == 0 or @sizes.include?('lg')
-            run_phantom_js(variable_name, "#{variable_name}.png",     75, tmp_options_file) if @sizes.size == 0 or @sizes.include?('sm')
+            run_phantom_js(variable, "#{variable.id}-lg.png", 600, tmp_options_file) if @sizes.size == 0 or @sizes.include?('lg')
+            run_phantom_js(variable, "#{variable.id}.png",     75, tmp_options_file) if @sizes.size == 0 or @sizes.include?('sm')
 
-            @progress[variable_name]['uploaded'] = (@deploy_mode and @progress[variable_name]['upload_failed'] != true)
+            @progress[variable.id]['uploaded'] << @webserver_name if @deploy_mode and @progress[variable.id]['upload_failed'] != true
+            @progress[variable.id].delete('uploaded_files')
+            @progress[variable.id].delete('upload_failed')
 
             save_current_progress
           end
@@ -141,9 +146,9 @@ module Spout
         File.delete(tmp_options_file) if File.exist?(tmp_options_file)
       end
 
-      def run_phantom_js(variable_name, png_name, width, tmp_options_file)
-        @progress[variable_name]['generated'] ||= []
-        @progress[variable_name]['uploaded_files'] ||= []
+      def run_phantom_js(variable, png_name, width, tmp_options_file)
+        @progress[variable.id]['generated'] ||= []
+        @progress[variable.id]['uploaded_files'] ||= []
 
         image_path = File.join(Dir.pwd, 'images', @standard_version, png_name)
         directory = File.join( File.dirname(__FILE__), '..', 'support', 'javascripts' )
@@ -159,18 +164,18 @@ module Spout
         if @pretend
           puts phantomjs_command
         else
-          if not @progress[variable_name]['generated'].include?(png_name) or not File.exist?(png_name) or (File.exist?(png_name) and File.size(png_name) == 0)
+          if not @progress[variable.id]['generated'].include?(png_name) or not File.exist?(png_name) or (File.exist?(png_name) and File.size(png_name) == 0)
             `#{phantomjs_command}`
-            @progress[variable_name]['generated'] << png_name
+            @progress[variable.id]['generated'] << png_name
           end
 
-          if @deploy_mode and not @progress[variable_name]['uploaded_files'].include?(png_name)
+          if @deploy_mode and not @progress[variable.id]['uploaded_files'].include?(png_name)
             response = send_to_server(image_path)
             if response.kind_of?(Hash) and response['upload'] == 'success'
-              @progress[variable_name]['uploaded_files'] << png_name
+              @progress[variable.id]['uploaded_files'] << png_name
             else
               puts "\nUPLOAD FAILED: ".colorize(:red) + File.basename(png_name)
-              @progress[variable_name]['upload_failed'] = true
+              @progress[variable.id]['upload_failed'] = true
             end
           end
         end

data/lib/spout/version.rb

@@ -3,7 +3,7 @@ module Spout
     MAJOR = 0
     MINOR = 10
     TINY = 0
-    BUILD = "rc" # nil, "pre", "rc", "rc2"
+    BUILD = "rc2" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.10.0.rc
+  version: 0.10.0.rc2
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake