spout 0.10.0.rc2 → 0.10.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7449161615e7a639d91a56f1a7a0ad76305bd4aa
-  data.tar.gz: a3cf532e5429e49c7f8b5631cc89d183e748a257
+  metadata.gz: bc9072ee8ab4b9edc7aca6cbcf3deac1beb6e0ae
+  data.tar.gz: 5aa46a8c58cee7bd2a42e43e5fe9cf2837d563d5
 SHA512:
-  metadata.gz: 1017da75474cb754296d88301fc6a2f81d3b0381dc23a38c0a7e39a322bf7c365af79876af3c792f6d3d02ab015c8671afaffb43b20d07e790f57bef1ed87e0c
-  data.tar.gz: 2f16bc92bd15d26d33307ab8aece2fe585922b5be8ac82f79cbb2ef4c9c12897ddd283e6f444065720608c4141ba282418cefdae2c9eb1335c1d368975c027c5
+  metadata.gz: e88283a8aad7684d12f51051a166d5daddc84455963b593f27903cc5d4b4f84fe51b1c7a9b5f0e0591f60e295b519e0ff6ad9f5f70a424a0cd5696bd59d1df8d
+  data.tar.gz: d44f4834ad2a885d8f1c17518dd29924d3de76ee31ffc88d6ebfb85d5a6423f23d3e2fafdab848db8c5310ee29d6f16c009259de1084b6b9035405d6f714de20

data/lib/spout/commands/deploy.rb

@@ -2,6 +2,7 @@ require 'colorize'
 require 'net/http'
 require 'io/console'
 
+require 'spout/helpers/subject_loader'
 require 'spout/helpers/config_reader'
 require 'spout/helpers/quietly'
 require 'spout/helpers/send_file'
@@ -44,7 +45,7 @@ module Spout
       INDENT_LENGTH = 23
       INDENT = " "*INDENT_LENGTH
 
-      attr_accessor :token, :version, :slug, :url, :config, :environment, :webserver_name
+      attr_accessor :token, :version, :slug, :url, :config, :environment, :webserver_name, :subjects
 
       def initialize(argv, version)
         @environment = argv[1].to_s
@@ -71,6 +72,10 @@ module Spout
           version_check unless @skip_checks
           test_check unless @skip_checks
           user_authorization
+
+          load_subjects_from_csvs unless @skip_graphs and @skip_images
+
+
           graph_generation unless @skip_graphs
           image_generation unless @skip_images
           dataset_uploads
@@ -80,6 +85,15 @@ module Spout
         end
       end
 
+      def load_subjects_from_csvs
+        @dictionary_root = Dir.pwd
+        @variable_files = Dir.glob(File.join(@dictionary_root, 'variables', '**', '*.json'))
+
+        @subject_loader = Spout::Helpers::SubjectLoader.new(@variable_files, [], @version, nil, @config.visit)
+        @subject_loader.load_subjects_from_csvs!
+        @subjects = @subject_loader.subjects
+      end
+
       def config_file_load
         print "   `.spout.yml` Check: "
         @config = Spout::Helpers::ConfigReader.new
@@ -201,7 +215,7 @@ module Spout
         require 'spout/commands/graphs'
         argv = []
         argv << "--clean" if @clean
-        Spout::Commands::Graphs.new(argv, @version, true, @url, @slug, @token, @webserver_name)
+        Spout::Commands::Graphs.new(argv, @version, true, @url, @slug, @token, @webserver_name, @subjects)
         puts "\r     Graph Generation: " + "DONE          ".colorize(:green)
       end
 
@@ -210,7 +224,7 @@ module Spout
         require 'spout/commands/images'
         argv = []
         argv << "--clean" if @clean
-        Spout::Commands::Images.new([], [], [], @version, argv, true, @url, @slug, @token, @webserver_name)
+        Spout::Commands::Images.new([], [], [], @version, argv, true, @url, @slug, @token, @webserver_name, @subjects)
         puts "\r     Image Generation: " + "DONE          ".colorize(:green)
       end
 

data/lib/spout/commands/graphs.rb

@@ -17,7 +17,7 @@ require 'spout/version'
 module Spout
   module Commands
     class Graphs
-      def initialize(variables, standard_version, deploy_mode = false, url = '', slug = '', token = '', webserver_name = '')
+      def initialize(variables, standard_version, deploy_mode = false, url = '', slug = '', token = '', webserver_name = '', subjects = nil)
         @deploy_mode = deploy_mode
         @url = url
         @standard_version = standard_version
@@ -67,10 +67,14 @@ module Spout
         @graphs_folder = File.join("graphs", @standard_version)
         FileUtils.mkpath @graphs_folder
 
-        @subject_loader = Spout::Helpers::SubjectLoader.new(@variable_files, @valid_ids, @standard_version, @number_of_rows, @config.visit)
 
-        @subject_loader.load_subjects_from_csvs!
-        @subjects = @subject_loader.subjects
+        @subjects = if subjects
+          subjects
+        else
+          @subject_loader = Spout::Helpers::SubjectLoader.new(@variable_files, @valid_ids, @standard_version, @number_of_rows, @config.visit)
+          @subject_loader.load_subjects_from_csvs!
+          @subjects = @subject_loader.subjects
+        end
 
         load_current_progress
 
@@ -88,13 +92,25 @@ module Spout
 
       def save_current_progress
         File.open(@progress_file,"w") do |f|
-          f.write(@progress.to_json)
+          f.write(JSON.pretty_generate(@progress) + "\n")
         end
       end
 
       def compute_tables_and_charts
-        variable_files_count = @variable_files.count
+        begin
+          iterate_through_variables
+        ensure
+          save_current_progress
+        end
+      end
+
+      def send_to_server(chart_json_file)
+        response = Spout::Helpers::SendFile.post("#{@url}/datasets/#{@slug}/upload_graph.json", chart_json_file, @standard_version, @token)
+      end
 
+
+      def iterate_through_variables
+        variable_files_count = @variable_files.count
         @variable_files.each_with_index do |variable_file, file_index|
           variable = Spout::Models::Variable.new(variable_file, @dictionary_root)
 
@@ -159,16 +175,11 @@ module Spout
               puts "\nUPLOAD FAILED: ".colorize(:red) + File.basename(chart_json_file)
             end
           end
-
-          save_current_progress
-
         end
-      end
 
-      def send_to_server(chart_json_file)
-        response = Spout::Helpers::SendFile.post("#{@url}/datasets/#{@slug}/upload_graph.json", chart_json_file, @standard_version, @token)
       end
 
+
     end
   end
 end

data/lib/spout/commands/images.rb

@@ -15,7 +15,7 @@ module Spout
   module Commands
     class Images
 
-      def initialize(types, variable_ids, sizes, standard_version, argv, deploy_mode = false, url = '', slug = '', token = '', webserver_name = '')
+      def initialize(types, variable_ids, sizes, standard_version, argv, deploy_mode = false, url = '', slug = '', token = '', webserver_name = '', subjects = nil)
         @deploy_mode = deploy_mode
         @url = url
         @standard_version = standard_version
@@ -42,10 +42,13 @@ module Spout
         @images_folder = File.join("images", @standard_version)
         FileUtils.mkpath @images_folder
 
-        @subject_loader = Spout::Helpers::SubjectLoader.new(@variable_files, @valid_ids, @standard_version, @number_of_rows, @config.visit)
-
-        @subject_loader.load_subjects_from_csvs!
-        @subjects = @subject_loader.subjects
+        @subjects = if subjects
+          subjects
+        else
+          @subject_loader = Spout::Helpers::SubjectLoader.new(@variable_files, @valid_ids, @standard_version, @number_of_rows, @config.visit)
+          @subject_loader.load_subjects_from_csvs!
+          @subjects = @subject_loader.subjects
+        end
 
         load_current_progress
 
@@ -62,11 +65,19 @@ module Spout
 
       def save_current_progress
         File.open(@progress_file,"w") do |f|
-          f.write(@progress.to_json)
+          f.write(JSON.pretty_generate(@progress) + "\n")
         end
       end
 
       def compute_images
+        begin
+          iterate_through_variables
+        ensure
+          save_current_progress
+        end
+      end
+
+      def iterate_through_variables
 
         options_folder = "images/#{@standard_version}"
         FileUtils.mkpath( options_folder )
@@ -138,8 +149,6 @@ module Spout
             @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
 
         end

data/lib/spout/version.rb

@@ -3,7 +3,7 @@ module Spout
     MAJOR = 0
     MINOR = 10
     TINY = 0
-    BUILD = "rc2" # nil, "pre", "rc", "rc2"
+    BUILD = "rc3" # 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.rc2
+  version: 0.10.0.rc3
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake