voog-kit 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48013ec6fe272a3a6133f9a610d20c81206167ea
-  data.tar.gz: d2429fdabe6243f3c6bffa58da1e78919513797e
+  metadata.gz: a43f2ab887fd0a79a362c3f2615f3be925f5874e
+  data.tar.gz: 40f3e9c9cbee44a066c5007da876dedcb94884ea
 SHA512:
-  metadata.gz: f9564892648ff8d743fedb767ffd7d4a99e6b0310c27f692d74fd9e06ff6bc49d2770ed9d78bb4cebf2f849c43f3bd816b48dac89e3433fcbe172caf1afb2c45
-  data.tar.gz: 7d9e297d744d4ec40db00ca0461e3bc20f349b0c6b3900f1ba975893ed4e2b922dad3d9d4c523b3df2900dc1b06894ded203ca6dab3269c69822a79da247dde5
+  metadata.gz: 0349c5f771587b3eb973a2e6886fa31bc3b91d0d3f09f4fa8fb639224d55113421034cd5d40c58d90754143be25d7c087b659f8b0e2455a9a4b173cf7a39d356
+  data.tar.gz: 1170fb9a1172a16a6486588160b8d5a75bdfafdc6c3636724fb6a528bb16d9ba2d100f721bacee7bb903690c4a0e076650ffe80b7b730c716b530530b88e9dbd

data/README.markdown

@@ -101,7 +101,9 @@ This command starts a watcher that monitors the current folder and its subfolder
 a file changes. This is most useful for styling your site as all style changes are instantly uploaded and visible in
 the browser.
 
-`watch` also looks for newly created files and file removals, updates the manifest accordingly and triggers `kit push`.
+`watch` also looks for newly created files and file removals, updates the manifest accordingly and triggers `kit push`. 
+
+You can stop the watch command by pressing Ctrl+D or typing "exit" or "q".
 
 ### help
 

data/bin/kit

@@ -154,6 +154,10 @@ command :manifest do |c|
 end
 
 desc 'Watches for file changes and pushes them automatically'
+long_desc "This starts watching the current folder and its subfolders for file 
+          changes and tries to push them to the remote site. When new files are
+          added or old ones removed, it also adds or removes them from the manifest
+          file, respectively. You can exit by pressing Ctrl+D or typing 'q' or 'exit'."
 command :watch do |c|
   c.switch *debug_args
   c.switch *verbose_args
@@ -200,7 +204,7 @@ pre do |global, command, options, args|
   api_token ||= @config[:api_token]
 
   client = Voog::Client.new(host, api_token)
-  @filemanager = Voog::Dtk::FileManager.new(client, verbose, silent)
+  @filemanager = Voog::Dtk::FileManager.new(client, @config, verbose, silent)
 end
 
 on_error do |exception|

data/lib/voog/dtk.rb

@@ -19,7 +19,8 @@ module Voog
       def read_config(block = nil, file = CONFIG_FILENAME)
         config = {
           :host => nil,
-          :api_token => nil
+          :api_token => nil,
+          :overwrite => false
         }
         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 : {}
@@ -39,6 +40,7 @@ module Voog
 
           config[:host] = options[@block].fetch("host")
           config[:api_token] = options[@block].fetch("api_token")
+          config[:overwrite] = options[@block].fetch("overwrite", false) == 'true' ? true : false
         end
         config
       end

data/lib/voog/dtk/filemanager.rb

@@ -8,18 +8,20 @@ require 'mime/types'
 module Voog::Dtk
   class FileManager
     attr_accessor :notifier
-    def initialize(client, verbose=false, silent=false)
+    def initialize(client, config, verbose=false, silent=false)
       @notifier = Voog::Dtk::Notifier.new($stderr, silent)
       @client = client
       @verbose = verbose
+      @config = config
+      puts "CONFIG: #{@config}"
     end
 
     def read_manifest
-      JSON.parse(File.read('manifest.json')).to_h
+      JSON.parse(File.read('manifest.json', :encoding => 'UTF-8')).to_h
     end
 
     def write_manifest(manifest)
-      File.open('manifest.json', 'w+') do |file|
+      File.open('manifest.json', 'w+', :encoding => 'UTF-8') do |file|
         file << JSON.pretty_generate(manifest)
       end
     end
@@ -97,16 +99,6 @@ module Voog::Dtk
       write_manifest @manifest
     end
 
-    def delete_remote_files(files)
-      return if files.nil?
-      files = (files.is_a? String) ? [files] : files
-      layouts = layout_id_map
-      assets = asset_id_map
-      files.uniq.each do |file|
-
-      end
-    end
-
     def get_layouts
       @client.layouts(per_page: 10000)
     end
@@ -131,6 +123,10 @@ module Voog::Dtk
       @client.update_layout_asset(id, data: data)
     end
 
+    def delete_layout_asset(id)
+      @client.delete_layout_asset(id)
+    end
+
     def valid?(item)
       if item.is_a? String
         begin
@@ -615,7 +611,16 @@ module Voog::Dtk
                       @notifier.error "Unable to update file #{file}!"
                     end
                   else
-                    @notifier.warning "Not allowed to update file #{file}! Skipping."
+                    if @config.fetch(:overwrite)
+                      @notifier.info "Re-uploading file #{file}..."
+                      if delete_layout_asset(layout_assets[file]) && create_remote_file(file)
+                        @notifier.success 'OK!'
+                      else
+                        @notifier.error "Unable to update file #{file}!"
+                      end
+                    else
+                      @notifier.warning "Not allowed to update file #{file}!"
+                    end
                   end
                 else
                   @notifier.warning "Remote file #{file} not found!"

data/lib/voog/dtk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler