voog-kit 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8863813d7301d1ef453c7cd7d5f00784669eaaa6
-  data.tar.gz: f1563e0b9a269ee60ee244d56d1b8c3fe209a3a0
+  metadata.gz: 9ed26cef655b21f91a963a0747fd9227a16d270c
+  data.tar.gz: 5babe8d69df18f767e3f7d704fb88efdfacf9d2f
 SHA512:
-  metadata.gz: 37296e044e868077970f32ed8f910009c85d0b5ebc12a98c2881d2120aaa1c8d3bf223c4446296d20b100068b0b5da5978ca4a640fc2aab9b37ad58c1f3561fe
-  data.tar.gz: 2c5c845654821f6119a61cb42d69434f4bdeb7ad741ab1ddfaa19adb254a301dd47ae07cae19893ed479ec80c910b715bc87824c04ddf3ed76e52f416d0029b2
+  metadata.gz: f6232baa6a43fe1e4ae01eedeffc0dfcf7b68dbe481eebd6c44d9c4baf3a5829dfe1d818e6c7aeb56ca1d735960b87a3bc9562129dbe94942c79e6146516fba9
+  data.tar.gz: 997aa20442c819223af501e32efad152e741c6875d171e658ded57561852b4e1652bbf38ac248733dd2b7949fcd15bf24d4f3ad8ebdcb173fd8ef3928b81c089

data/README.markdown

@@ -18,13 +18,7 @@ means it can be run from anywhere in your system.
 
 
 ### API token
-To use the toolkit, you have to generate your API token from your profile settings 
-page (http://yoursite.voog.com/admin/people/profile). 
-![generating the API token](https://dl.dropboxusercontent.com/u/10145790/generating_api_token.png)
-
-You should see something like this:
-
-![API token is generated](https://dl.dropboxusercontent.com/u/10145790/api_token_generated.png)
+To use the toolkit, you have to provide your API token. [Here's a short guide how to generate one](https://www.voog.com/support/guides/stats-and-maintenance/how-to-generate-an-api-token).
 
 Without this token, *kit* will not allow you to access or change your layout files.
 

data/bin/kit

@@ -269,6 +269,7 @@ pre do |global, command, options, args|
     matched_protocol = host.match(/^https?:\/\//)
     if (matched_protocol)
       protocol_string = matched_protocol[0].slice(0, matched_protocol[0].length-3)
+      puts 'protocol string' + protocol_string
       if options.fetch(:protocol, '').empty?
         protocol = protocol_string
       else
@@ -277,10 +278,10 @@ pre do |global, command, options, args|
       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)
+      protocol = options.fetch(:protocol, '')
     end
   else
-    protocol = options.fetch(:protocol, '').empty? ? 'http' : options.fetch(:protocol)
+    protocol = options.fetch(:protocol, '')
   end
 
   if host && api_token
@@ -288,9 +289,8 @@ pre do |global, command, options, args|
       host: host,
       api_token: api_token,
       block: @config_block || host,
-      overwrite: overwrite,
-      protocol: protocol
-    })
+      overwrite: overwrite
+    }.tap { |h| h[:protocol] = protocol unless protocol.empty? })
   end
 
   @config = Voog::Dtk.read_config @config_block
@@ -309,6 +309,7 @@ pre do |global, command, options, args|
   host ||= @config[:host]
   api_token ||= @config[:api_token]
   overwrite ||= @config[:overwrite]
+  protocol = protocol.empty? ? @config[:protocol] || 'http' : protocol
 
   client = Voog::Client.new(host, api_token, protocol: protocol, raise_on_error: true)
   @filemanager = Voog::Dtk::FileManager.new(client, {

data/lib/voog/dtk/version.rb

@@ -1,5 +1,5 @@
 module Voog
   module Dtk
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Voog Developer Toolkit