spout 0.10.0.beta6 → 0.10.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c5a33171e6f9d0ed9ea65595d6fa2cc846c522
-  data.tar.gz: b83e43ccf34a70eac9d4485861a40f4a0f2269dc
+  metadata.gz: d4418b6291f10a58bcf649b785114423a462aca8
+  data.tar.gz: 16a62a4c3357173af4808bd5a5ab9d767f692296
 SHA512:
-  metadata.gz: 8c6f37201645cd745c38d14ad5599ee702d313e41dc6f27cea28883d9a21c7cdf616287f7340df1e2fd1588c621fdb43f3a0c52b584e5744d60a8fcf277d3ade
-  data.tar.gz: e5d504aa8ab9bf0acdb71e0d0ad5a17fbecf4889b5d577fb1f8ecbca10d21446af6dd0e17ad925db8950af1ea5783a8b8c83b15955f85aeb41c9f19469b4be3a
+  metadata.gz: fdaeae598fccf2e5d29be1d491efc4951d02e56eaeb2917fb91a944b8eaea24d5fd4780bebb281116d42e8271fc63798694a53a1bdc3a69d0a926e7535a684de
+  data.tar.gz: 38b272dfe518b4e230b6e4eec679b00838259c0fc3b3d0e1b3f5af39a56325ce702c1af3542a885e7c9e71c066ed1a8c38a72fc30a7ae1be6fc593bb07c9f576

data/lib/spout/commands/deploy.rb

@@ -3,6 +3,9 @@ require 'net/http'
 
 require 'spout/helpers/config_reader'
 require 'spout/helpers/quietly'
+require 'spout/helpers/send_file'
+require 'spout/helpers/semantic'
+require 'spout/helpers/json_request'
 
 # - **User Authorization**
 #   - User authenticates via token, the user must be a dataset editor
@@ -43,11 +46,14 @@ module Spout
       attr_accessor :token, :version, :slug, :url, :config, :environment
 
       def initialize(argv, version)
-        # puts "CODE GREEN INITIALIZED...".colorize(:green)
-        # puts "Deploying to server...".colorize(:red)
         @environment = argv[1].to_s
         @version = version
-        @skip_checks = false
+        @skip_checks = (argv.delete('--skip-checks') != nil)
+
+        @skip_graphs = (argv.delete('--skip-graphs') != nil)
+        @skip_images = (argv.delete('--skip-images') != nil)
+        @skip_server_updates = (argv.delete('--skip-server-updates') != nil)
+
         run_all
       end
 
@@ -57,10 +63,10 @@ module Spout
           version_check unless @skip_checks
           test_check unless @skip_checks
           user_authorization
-          graph_generation
-          image_generation
+          graph_generation unless @skip_graphs
+          image_generation unless @skip_images
           dataset_uploads
-          trigger_server_updates
+          trigger_server_updates unless @skip_server_updates
         rescue DeployError
         end
       end
@@ -184,17 +190,29 @@ module Spout
       end
 
       def dataset_uploads
-        print "      Dataset Uploads: "
-        # failure ''
-        # puts "PASS".colorize(:green)
-        puts "SKIP".colorize(:blue)
+        available_folders = (Dir.exist?('csvs') ? Dir.entries('csvs').select{|e| File.directory? File.join('csvs', e) }.reject{|e| [".",".."].include?(e)}.sort : [])
+
+        semantic = Spout::Helpers::Semantic.new(@version, available_folders)
+
+        csv_directory = semantic.selected_folder
+
+        csv_files = Dir.glob("csvs/#{csv_directory}/*.csv")
+
+        csv_files.each_with_index do |csv_file, index|
+          print "\r      Dataset Uploads: " + "#{index + 1} of #{csv_files.count}".colorize(:green)
+          response = Spout::Helpers::SendFile.post("#{@url}/datasets/#{@slug}/upload_dataset_csv.json", csv_file, @version, @token)
+        end
+        puts "\r      Dataset Uploads: " + "DONE          ".colorize(:green)
       end
 
       def trigger_server_updates
         print "Launch Server Scripts: "
-        # failure ''
-        # puts "PASS".colorize(:green)
-        puts "SKIP".colorize(:blue)
+        response = Spout::Helpers::JsonRequest.get("#{@url}/datasets/#{@slug}/a/#{@token}/refresh_dictionary.json?version=#{@version}")
+        if response and response['refresh'] == 'success'
+          puts "DONE".colorize(:green)
+        else
+          puts "FAIL".colorize(:red)
+        end
       end
 
       def failure(message)

data/lib/spout/helpers/json_request.rb

@@ -0,0 +1,45 @@
+require 'openssl'
+require 'net/http'
+require 'json'
+
+module Spout
+  module Helpers
+    class JsonRequest
+      class << self
+        def get(*args)
+          new(*args).get
+        end
+      end
+
+      attr_reader :url
+
+      def initialize(url)
+        begin
+          @url = URI.parse(url)
+          @http = Net::HTTP.new(@url.host, @url.port)
+          if @url.scheme == 'https'
+            @http.use_ssl = true
+            @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+        rescue
+        end
+      end
+
+      def get
+        begin
+          full_path = @url.path
+          full_path += "?#{@url.query}" if @url.query
+          req = Net::HTTP::Get.new(full_path)
+          response = @http.start do |http|
+            http.request(req)
+          end
+          JSON.parse(response.body)
+        rescue
+          nil
+        end
+      end
+    end
+  end
+end
+
+

data/lib/spout/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta6
+  version: 0.10.0.beta7
 platform: ruby
 authors:
 - Remo Mueller
@@ -122,6 +122,7 @@ files:
 - lib/spout/helpers/config_reader.rb
 - lib/spout/helpers/iterators.rb
 - lib/spout/helpers/json_loader.rb
+- lib/spout/helpers/json_request.rb
 - lib/spout/helpers/number_helper.rb
 - lib/spout/helpers/quietly.rb
 - lib/spout/helpers/semantic.rb