voog-kit 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43f2ab887fd0a79a362c3f2615f3be925f5874e
-  data.tar.gz: 40f3e9c9cbee44a066c5007da876dedcb94884ea
+  metadata.gz: e1c88db6b03fc5e1e036dd8ed3df13bb2f5cb1b2
+  data.tar.gz: eb9caf57e75c716860c4c2b719d5f283a8cd090a
 SHA512:
-  metadata.gz: 0349c5f771587b3eb973a2e6886fa31bc3b91d0d3f09f4fa8fb639224d55113421034cd5d40c58d90754143be25d7c087b659f8b0e2455a9a4b173cf7a39d356
-  data.tar.gz: 1170fb9a1172a16a6486588160b8d5a75bdfafdc6c3636724fb6a528bb16d9ba2d100f721bacee7bb903690c4a0e076650ffe80b7b730c716b530530b88e9dbd
+  metadata.gz: 621fd03b7e3dfdbd2801bff9df93337cdbaf93b329de9b71fcc99579b4cb329bca156746ac41c39be6fc3a56a0a5b73adec06b78852084cb3daf18b2fabd75a4
+  data.tar.gz: 2771bf3cad4702850652021296b9e3fa1253bf090b125206885e6954b29fdbb4de6459d3a42cd2bf3ba94fe57b2d0fbda98111681d15e9c24b3373c719af1ecd

data/README.markdown

@@ -62,6 +62,17 @@ If the configuration file isn't present and you provide the token, hostname and
 command, the file is then generated and the options are stored within so you don't have to provide them
 later.
 
+Another useful option is `--overwrite` to allow updating asset files you normally couldn't update. This deletes the 
+old file and uploads the newer one as a replacement. This cannot be undone, so take caution!
+To enable overwriting for all commands, you can add it to the site's configuration block in the `.voog` file like so:
+
+```
+[site1]
+  host=mysite.voog.com
+  api_token=afcf30182aecfc8155d390d7d4552d14
+  overwrite=true
+```
+
 ### init
 
 This command either initializes an empty folder structure via `kit init empty`, clones the file and folder

data/bin/kit

@@ -24,6 +24,7 @@ silent_args = [:silent, { default_value: false, negatable: false, desc: 'Hide al
 hostname_args = [:h, :host, :hostname, { desc: 'Provide a hostname', arg_name: :HOST }]
 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. '}]
 
 flag *hostname_args
 flag *api_token_args
@@ -32,6 +33,8 @@ flag *site_args
 switch *debug_args
 switch *verbose_args
 switch *silent_args
+switch *overwrite_args
+
 version Voog::Dtk::VERSION
 
 desc 'Initializes the local folder structure and files for a site'
@@ -47,6 +50,7 @@ command :init do |c|
   c.switch *debug_args
   c.switch *verbose_args
   c.switch *silent_args
+  c.switch *overwrite_args
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
@@ -74,6 +78,7 @@ command :check do |c|
   c.switch *debug_args
   c.switch *verbose_args
   c.switch *silent_args
+  c.switch *overwrite_args
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
@@ -92,6 +97,7 @@ command :pull do |c|
   c.switch *debug_args
   c.switch *verbose_args
   c.switch *silent_args
+  c.switch *overwrite_args
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
@@ -115,6 +121,7 @@ command :push do |c|
   c.switch *debug_args
   c.switch *verbose_args
   c.switch *silent_args
+  c.switch *overwrite_args
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
@@ -135,6 +142,7 @@ command :manifest do |c|
   c.switch *debug_args
   c.switch *verbose_args
   c.switch *silent_args
+  c.switch *overwrite_args
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
@@ -162,6 +170,7 @@ command :watch do |c|
   c.switch *debug_args
   c.switch *verbose_args
   c.switch *silent_args
+  c.switch *overwrite_args
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
@@ -177,6 +186,7 @@ pre do |global, command, options, args|
 
   silent = global.fetch(:silent, false) || options.fetch(:silent, false)
   verbose = global.fetch(:verbose, false) || options.fetch(:verbose, false)
+  overwrite = global.fetch(:overwrite, false) || options.fetch(:overwrite, false)
 
   @notifier = Voog::Dtk::Notifier.new($stderr, silent)
 
@@ -184,7 +194,12 @@ pre do |global, command, options, args|
   api_token = global.fetch(:token, nil) || options.fetch(:token, nil)
 
   if host && api_token && @config_block
-    Voog::Dtk.write_config(host, api_token, @config_block)
+    Voog::Dtk.write_config({
+      host: host,
+      api_token: api_token,
+      block: @config_block,
+      overwrite: overwrite
+    })
   end
 
   @config = Voog::Dtk.read_config @config_block
@@ -204,7 +219,11 @@ pre do |global, command, options, args|
   api_token ||= @config[:api_token]
 
   client = Voog::Client.new(host, api_token)
-  @filemanager = Voog::Dtk::FileManager.new(client, @config, verbose, silent)
+  @filemanager = Voog::Dtk::FileManager.new(client, {
+    silent: silent,
+    verbose: verbose,
+    overwrite: overwrite
+  })
 end
 
 on_error do |exception|

data/lib/voog/dtk/filemanager.rb

@@ -8,12 +8,12 @@ require 'mime/types'
 module Voog::Dtk
   class FileManager
     attr_accessor :notifier
-    def initialize(client, config, verbose=false, silent=false)
-      @notifier = Voog::Dtk::Notifier.new($stderr, silent)
+    def initialize(client, opts = {})
       @client = client
-      @verbose = verbose
-      @config = config
-      puts "CONFIG: #{@config}"
+      @silent = opts.fetch(:silent, false)
+      @verbose = opts.fetch(:verbose, false)
+      @overwrite = opts.fetch(:overwrite, false)
+      @notifier = Voog::Dtk::Notifier.new($stderr, @silent)
     end
 
     def read_manifest
@@ -430,7 +430,6 @@ module Voog::Dtk
       not_ok_char = "!"
       @notifier.info "Checking manifest.json..."
 
-      # Check for manifest
       if File.exists? 'manifest.json'
         @manifest = read_manifest
         @notifier.success 'OK!'
@@ -611,7 +610,7 @@ module Voog::Dtk
                       @notifier.error "Unable to update file #{file}!"
                     end
                   else
-                    if @config.fetch(:overwrite)
+                    if @overwrite
                       @notifier.info "Re-uploading file #{file}..."
                       if delete_layout_asset(layout_assets[file]) && create_remote_file(file)
                         @notifier.success 'OK!'

data/lib/voog/dtk/version.rb

@@ -1,5 +1,5 @@
 module Voog
   module Dtk
-    VERSION = '0.1.11'
+    VERSION = '0.2.0'
   end
 end

data/lib/voog/dtk.rb

@@ -45,7 +45,12 @@ module Voog
         config
       end
 
-      def write_config(host, api_token, block, silent=false)
+      def write_config(opts)
+        block = opts.fetch(:block, '')
+        host = opts.fetch(:host, '')
+        api_token = opts.fetch(:api_token, '')
+        silent = opts.fetch(:silent, false)
+
         @file = if config_exists?
           CONFIG_FILENAME
         elsif global_config_exists?
@@ -61,11 +66,13 @@ 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?
         else
           puts "Writing configuration options to new config block.".white unless silent
           options.params[block] = {
             'host' => host,
-            'api_token' => api_token
+            'api_token' => api_token,
+            'overwrite' => overwrite
           }
         end
 

data/spec/fixtures/manifest.json

@@ -3,7 +3,7 @@
     {
       "component": true,
       "content_type": "component",
-      "file": "test_component.tpl",
+      "file": "components/test_component.tpl",
       "layout_name": "test_component",
       "title": "test_component"
     }

data/spec/models/dtk/filemanager_spec.rb

@@ -7,7 +7,7 @@ describe Voog::Dtk::FileManager do
   before :all do
     Dir.mkdir 'TEST'
     Dir.chdir 'TEST'
-    @filemanager = Voog::Dtk::FileManager.new(nil, false, true)
+    @filemanager = Voog::Dtk::FileManager.new(nil, {silent: false, verbose: true, overwrite: false})
     @dir = Dir.new('.')
   end
 
@@ -284,7 +284,7 @@ describe Voog::Dtk::FileManager do
     end
   end
 
-  describe '#remove_from_manifest', focus: true do
+  describe '#remove_from_manifest' do
     before :all do
       @filemanager.generate_manifest(get_layouts, get_layout_assets)
       @filemanager.add_to_manifest ['components/testfile2.tpl', 'assets/test.svg']
@@ -319,12 +319,21 @@ describe Voog::Dtk::FileManager do
 
   describe '#check' do
     context 'with an empty folder' do
+      before :all do
+        Dir.mkdir('temp')
+        Dir.chdir('temp')
+      end
+
+      after :all do
+        Dir.chdir('..')
+        Dir.delete('temp')
+      end
       it 'returns false' do
         expect(@filemanager.check).to be_false
       end
     end
 
-    context 'with empty manifest.json but no files' do
+    context 'with empty manifest.json and no files' do
       it 'returns false' do
         File.open('manifest.json', 'w+') do |file|
           file << {
@@ -338,7 +347,7 @@ describe Voog::Dtk::FileManager do
 
     context 'with filled manifest.json but no files' do
       it 'returns false' do
-        File.open('manifest.json', 'w+') do |file|
+        @manifest = File.open('manifest.json', 'w+') do |file|
           file << {
             'layouts' => [{
               "component" => false,

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ require_relative '../lib/voog/dtk/notifier.rb'
 
 RSpec.configure do |c|
   # filter_run is short-form alias for filter_run_including
-  c.filter_run focus: true
 end
 
 FIXTURE_PATH = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - Mikk Pristavka