voog-kit 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c7ac235dd563c5bfebdf3a3c1153c9898da4810
-  data.tar.gz: e3d3d75ae208a8af22c2198fb8882656dc4b6051
+  metadata.gz: cd2594260b0fbf7e26ad8e55a7eacfbef664fc69
+  data.tar.gz: 4cac4348a4f3ec4c8b2332fb6bcb38a95034f44f
 SHA512:
-  metadata.gz: 9787c777adc1df1fd0d42f396677195af1a2c8766a780735f8a13f7428cea44abc0635fc78d882cb8495fc934700b413123897a8ad058dd1332992fbe68f7a5b
-  data.tar.gz: 04e62394e467681c2013a9683f919ee2fc93e560360bff2a3b579c7105c22f99d194ddf0e214c51111b920415ef2986832f7232326e8c2817ca24bbbfea1deaa
+  metadata.gz: c14a1298aaa6c57458ac15a5667b403bea6fc3ef03d55ab798b1eeff62731a46a5d8c926fe09453467b113f855284bc1c72e22eabc340c08f6a164b53f9ead19
+  data.tar.gz: 2cc2504593c300e8b6122b83095b14d4f3a7639fbd8731f52f6ca203dbb89cc5e1b1b67b3ff56eb2f0b98a55d6fd8a9ceee3a978607b6e09485305e923984a6a

data/bin/kit

@@ -24,10 +24,12 @@ hostname_args = [:h, :host, :hostname, { desc: 'Provide a hostname', arg_name: :
 api_token_args = [:t, :token, :api_token, { desc: 'Provide an API token', arg_name: :API_TOKEN }]
 site_args = [:s, :site, { arg_name: :SITE, default_value: nil, desc: 'Specify which site block to use when parsing the .voog file' }]
 overwrite_args = [:overwrite, { negatable: true, default_value: false, desc: 'Enable overwriting asset files that cannot be normally updated.' }]
+protocol_args = [:protocol, { negatable: false, default_value: '', desc: 'Set protocol to use (HTTP or HTTPS)' }]
 
 flag *hostname_args
 flag *api_token_args
 flag *site_args
+flag *protocol_args
 
 switch *debug_args
 switch *verbose_args
@@ -52,6 +54,7 @@ command :init do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
 
   c.desc 'Initializes the local project folder with remote layout files'
   c.action do |global_options, options, args|
@@ -88,6 +91,7 @@ command :check do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
   c.action do |global_options, options, args|
     @filemanager.check
   end
@@ -111,6 +115,7 @@ command :pull do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
   c.action do |global_options, options, args|
     unless args.empty? # if filenames are given, pull specified files and generate new manifest
       @filemanager.pull_files(args)
@@ -135,6 +140,7 @@ command :push do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
   c.action do |global_options, options, args|
     @filemanager.upload_files args
   end
@@ -150,6 +156,7 @@ command :remove do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
   c.action do |global_options, options, args|
     @filemanager.remove_files args
   end
@@ -165,6 +172,7 @@ command :add do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
   c.action do |global_options, options, args|
     @filemanager.add_files args
   end
@@ -186,6 +194,7 @@ command :manifest do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
   c.switch(
     [:r, :remote],
     default_value: false,
@@ -213,6 +222,7 @@ command :sites do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
   c.action do |global_options, options, args|
     @filemanager.display_sites(Voog::Dtk.read_config(:all))
   end
@@ -232,6 +242,7 @@ command :watch do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+  c.flag *protocol_args
   c.action do |global_options, options, args|
     @notifier.info "Watching #{Dir.pwd}/ for changes..."
     @notifier.newline
@@ -253,12 +264,32 @@ pre do |global, command, options, args|
   host = global.fetch(:host, nil) || options.fetch(:host, nil)
   api_token = global.fetch(:token, nil) || options.fetch(:token, nil)
 
+  # check if protocol is provided with the host URL
+  if host
+    matched_protocol = host.match(/^https?:\/\//)
+    if (matched_protocol)
+      protocol_string = matched_protocol[0].slice(0, matched_protocol[0].length-3)
+      if options.fetch(:protocol, '').empty?
+        protocol = protocol_string
+      else
+        protocol = options.fetch(:protocol)
+      end
+      protocol = protocol.empty? ? protocol_string : protocol
+      host = host.slice(matched_protocol[0].length, host.length)
+    else
+      protocol = options.fetch(:protocol, '').empty? ? 'http' : options.fetch(:protocol)
+    end
+  else
+    protocol = options.fetch(:protocol, '').empty? ? 'http' : options.fetch(:protocol)
+  end
+
   if host && api_token
     Voog::Dtk.write_config({
       host: host,
       api_token: api_token,
       block: @config_block || host,
-      overwrite: overwrite
+      overwrite: overwrite,
+      protocol: protocol
     })
   end
 
@@ -277,12 +308,14 @@ pre do |global, command, options, args|
 
   host ||= @config[:host]
   api_token ||= @config[:api_token]
+  overwrite ||= @config[:overwrite]
 
-  client = Voog::Client.new(host, api_token)
+  client = Voog::Client.new(host, api_token, protocol: protocol, raise_on_error: true)
   @filemanager = Voog::Dtk::FileManager.new(client, {
     silent: silent,
     verbose: verbose,
-    overwrite: overwrite
+    overwrite: overwrite,
+    protocol: protocol
   })
 end
 

data/lib/voog/dtk.rb

@@ -1,6 +1,6 @@
 require 'voog/dtk/version'
 require 'parseconfig'
-require 'prettyprint'
+require 'pp'
 
 module Voog
   module Dtk
@@ -20,7 +20,8 @@ module Voog
         config = {
           :host => nil,
           :api_token => nil,
-          :overwrite => false
+          :overwrite => nil,
+          :protocol => 'http'
         }
         local_config = config_exists?(file) ? ParseConfig.new(File.expand_path(file)).params : {}
         global_config = global_config_exists?(file) ? ParseConfig.new(File.expand_path([ENV['HOME'], file].join('/'))).params : {}
@@ -47,13 +48,16 @@ module Voog
               config << {
                 name: site,
                 host: options[site].fetch('host'),
-                api_token: options[site].fetch('api_token')
+                api_token: options[site].fetch('api_token'),
+                overwrite: options[site].fetch('overwrite'),
+                protocol: options[site].fetch('protocol')
               }
             end
           else
             config[:host] = options[@block].fetch("host")
             config[:api_token] = options[@block].fetch("api_token")
             config[:overwrite] = options[@block].fetch("overwrite", false) == 'true' ? true : false
+            config[:protocol] = options[@block].fetch("protocol", 'http') == "https" ? "https" : "http"
           end
         end
         config
@@ -64,7 +68,8 @@ module Voog
         host = opts.fetch(:host, '')
         api_token = opts.fetch(:api_token, '')
         silent = opts.fetch(:silent, false)
-        overwrite = opts.fetch(:overwrite, false)
+        overwrite = opts.fetch(:overwrite, '')
+        protocol = opts.fetch(:protocol, '')
 
         @file = if config_exists?
           CONFIG_FILENAME
@@ -81,13 +86,15 @@ module Voog
           puts "Writing new configuration options to existing config block.".white unless silent
           options.params[block]['host'] = host unless host.empty?
           options.params[block]['api_token'] = api_token unless api_token.empty?
-          options.params[block]['overwrite'] = overwrite unless overwrite.empty?
+          options.params[block]['overwrite'] = overwrite if (overwrite == true || overwrite == false)
+          options.params[block]['protocol'] = (protocol == 'https' ? 'https' : 'http') unless protocol.empty?
         else
           puts "Writing configuration options to new config block.".white unless silent
           options.params[block] = {
             'host' => host,
             'api_token' => api_token,
-            'overwrite' => overwrite
+            'overwrite' => (overwrite == true ? true : false),
+            'protocol' => (protocol == 'https' ? 'https' : 'http')
           }
         end
 

data/lib/voog/dtk/version.rb

@@ -1,5 +1,5 @@
 module Voog
   module Dtk
-    VERSION = '0.4.0'
+    VERSION = '0.5.1'
   end
 end

data/voog-kit.gemspec

@@ -25,13 +25,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'guard-rspec'
-  
   spec.add_runtime_dependency 'gli', '2.10.0'
+
   spec.add_runtime_dependency 'pry'
   spec.add_runtime_dependency 'listen', '~> 3.0'
   spec.add_runtime_dependency 'git'
   spec.add_runtime_dependency 'parseconfig'
-  spec.add_runtime_dependency 'voog_api', '~> 0.0.7'
+  spec.add_runtime_dependency 'voog_api', '~> 0.0.9'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'mime-types', '>= 1.25.1', '< 3.0'
   spec.add_runtime_dependency 'rb-readline'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement