voog-kit 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca9d43de96a85cceacfc9ca445810fff9a51f9c
-  data.tar.gz: 3c9c89d32194b02a8a6cb0eea78c409a102d3a2f
+  metadata.gz: 36f989cd5ef93ad83de52a35f6529bc233f186e1
+  data.tar.gz: 98924d5947e7ceca25172f763aed37e5de5cebce
 SHA512:
-  metadata.gz: fa8c0fc65383f9d0a5bd47cd673ee097f3396de404c2e317322633a159ee4b05172cde28a91e055c3e1112baa8e742667e9b705b0e0ab9208cc23fa46a22f952
-  data.tar.gz: bf8576c04f7c357633196fa44dd8431874140a01cfaa7729d5f9f7a014fc7b02db63062edc1d4fe816af4d3bfe63d1255f620fe6d172315c45e6adca30f03352
+  metadata.gz: 2a36764dfa04dc9d3df2ab23483a0928fb0c93891c15b3083f2a2f357f4684e5f23086423c43a849417574d0c7bb37f361025c548f3881f86c96948603faac8b
+  data.tar.gz: b1dadd5e5a7ea43b7a43f2c53245ad33488b44c1766724fa04ca07eaf74ea1b0ec4be369fbaa9277a502775fe9b3e1be262efd62830858b9db1a4b2c62b34740

data/bin/kit

@@ -24,7 +24,8 @@ 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. '}]
+overwrite_args = [:overwrite, { negatable: true, default_value: false, desc: 'Enable overwriting asset files that cannot be normally updated.' }]
+cleanup_args = [:cleanup, { negatable: false, default_value: false, desc: 'Delete remote layout files that are not in local manifest.' }]
 
 flag *hostname_args
 flag *api_token_args
@@ -122,6 +123,7 @@ command :push do |c|
   c.switch *verbose_args
   c.switch *silent_args
   c.switch *overwrite_args
+  c.switch *cleanup_args
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
@@ -130,6 +132,21 @@ command :push do |c|
   end
 end
 
+desc 'Removes a specific file and syncs it with the remote site'
+long_desc 'This command removes a local file, removes it from the manifest and sends a deleted
+          request to remove it from the remote site as well.'
+command :remove do |c|
+  c.switch *debug_args
+  c.switch *verbose_args
+  c.switch *silent_args
+  c.flag *hostname_args
+  c.flag *api_token_args
+  c.flag *site_args
+  c.action do |global_options, options, args|
+    @filemanager.remove_files args
+  end
+end
+
 desc "Generates a manifest.json file from the site's layout and asset files."
 long_desc "This looks through the current directory's subdirectories and files
           within them to compile a 'manifest.json' file. This is used for keeping
@@ -187,6 +204,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)
+  cleanup = global.fetch(:cleanup, false) || options.fetch(:cleanup, false)
 
   @notifier = Voog::Dtk::Notifier.new($stderr, silent)
 
@@ -223,7 +241,8 @@ pre do |global, command, options, args|
   @filemanager = Voog::Dtk::FileManager.new(client, {
     silent: silent,
     verbose: verbose,
-    overwrite: overwrite
+    overwrite: overwrite,
+    cleanup: cleanup
   })
 end
 

data/lib/voog/dtk.rb

@@ -9,11 +9,11 @@ module Voog
 
     class << self
       def config_exists?(filename=CONFIG_FILENAME)
-        filename && !filename.empty? && File.exists?(filename)
+        filename && !filename.empty? && File.exist?(filename)
       end
 
       def global_config_exists?(filename=CONFIG_FILENAME)
-        filename && !filename.empty? && File.exists?([ENV['HOME'], filename].join('/'))
+        filename && !filename.empty? && File.exist?([ENV['HOME'], filename].join('/'))
       end
 
       def read_config(block = nil, file = CONFIG_FILENAME)

data/lib/voog/dtk/filemanager.rb

@@ -13,6 +13,7 @@ module Voog::Dtk
       @silent = opts.fetch(:silent, false)
       @verbose = opts.fetch(:verbose, false)
       @overwrite = opts.fetch(:overwrite, false)
+      @cleanup = opts.fetch(:cleanup, false)
       @notifier = Voog::Dtk::Notifier.new($stderr, @silent)
     end
 
@@ -85,16 +86,17 @@ module Voog::Dtk
         if %w(component layout).include? type
           @manifest['layouts'].delete_if do |layout|
             match = layout.fetch('file', nil) == file
-            @notifier.info "Removed #{file} from manifest.json\n" if match
+            @notifier.info "Removed #{file} from manifest.json" if match
             match
           end
         elsif %w(image javascript asset stylesheet).include? type
           @manifest['assets'].delete_if do |asset|
             match = asset.fetch('file', nil) == file
-            @notifier.info "Removed #{file} from manifest.json\n" if match
+            @notifier.info "Removed #{file} from manifest.json" if match
             match
           end
         end
+        @notifier.newline
       end
       write_manifest @manifest
     end
@@ -123,6 +125,10 @@ module Voog::Dtk
       @client.update_layout_asset(id, data: data)
     end
 
+    def delete_layout(id)
+      @client.delete_layout(id)
+    end
+
     def delete_layout_asset(id)
       @client.delete_layout_asset(id)
     end
@@ -488,6 +494,8 @@ module Voog::Dtk
       else
         @notifier.success 'OK!'
       end
+
+      return (missing_assets.count + missing_layouts.count == 0)
     end
 
     def fetch_boilerplate(dst='tmp')
@@ -714,6 +722,57 @@ module Voog::Dtk
       @client.create_layout_asset(data)
     end
 
+    def is_asset?(filename)
+      asset_folders = %w(assets images stylesheets javascripts)
+      return File.file?(filename) && asset_folders.include?(filename.split('/').first)
+    end
+
+    def is_layout?(filename)
+      layout_folders = %w(components layouts)
+      return File.file?(filename) && layout_folders.include?(filename.split('/').first)
+    end
+
+    def remove_files(names)
+      asset_ids = layout_asset_id_map
+      layout_ids = layout_id_map
+      names.each do |name|
+        if is_asset? name
+          remove_from_manifest(name)
+          remove_local_file(name)
+          id = asset_ids.fetch(name, nil)
+          if id && delete_layout_asset(id)
+            @notifier.info "Removed remote file #{name}." unless @silent
+          else
+            @notifier.error "Failed to remove remote file #{name}!" unless @silent
+          end
+        elsif is_layout? name
+          remove_from_manifest(name)
+          remove_local_file(name)
+          id = layout_ids.fetch(name, nil)
+          if id && delete_layout( id )
+            @notifier.info "Removed remote file #{name}." unless @silent
+          else
+            @notifier.error "Failed to remove remote file #{name}!" unless @silent
+          end
+        else
+          @notifier.error "Invalid filename: \"#{name}\""
+        end
+        @notifier.newline
+      end
+    end
+
+    def remove_local_file(file)
+      if File.exist?(file) && File.delete(file)
+        @notifier.info "Removed local file #{file}." unless @silent
+        @notifier.newline
+        return true
+      else
+        @notifier.error "Failed to remove file #{file}." unless @silent
+        @notifier.newline
+        return false
+      end
+    end
+
     def uploadable?(file)
       if file.is_a? String
         !(file =~ /^(component|layout|image|asset|javascript|stylesheet)s\/([^\s]+)/).nil?

data/lib/voog/dtk/version.rb

@@ -1,5 +1,5 @@
 module Voog
   module Dtk
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

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, {silent: false, verbose: true, overwrite: false})
+    @filemanager = Voog::Dtk::FileManager.new(nil, {silent: true, verbose: true, overwrite: false})
     @dir = Dir.new('.')
   end
 
@@ -179,7 +179,6 @@ describe Voog::Dtk::FileManager do
         expect(@filemanager.generate_manifest(layouts, layout_assets)).to be false
       end
     end
-
   end
 
   describe '#add_to_manifest' do
@@ -279,11 +278,79 @@ describe Voog::Dtk::FileManager do
       end
       it 'returns false if the file is not in the manifest' do
         filename = 'components/wrong_file.tpl'
-        expect(@filemanager.in_manifest?(filename, @manifest)).to be_false
+        expect(@filemanager.in_manifest?(filename, @manifest)).to eq(false)
       end
     end
   end
 
+  describe '#is_asset?', focus: true do
+    before :all do
+      @filemanager.create_folders
+      @filemanager.create_asset get_layout_asset
+    end
+
+    context 'with a valid asset filename' do
+      it 'returns true' do
+        expect(@filemanager.is_asset? 'stylesheets/test.css').to eq(true)
+      end
+    end
+
+    context 'with an invalid asset filename' do
+      it' returns false' do
+        expect(@filemanager.is_asset? 'layouts/front_page.tpl').to eq(false)
+      end
+    end
+  end
+
+  describe '#is_layout?', focus: true do
+    before :all do
+      @filemanager.create_layout get_layout
+    end
+    context 'with a valid layout filename' do
+      it 'returns true' do
+        expect(@filemanager.is_layout? 'components/test.tpl').to eq(true)
+      end
+    end
+
+    context 'with an invalid layout filename' do
+      it' returns false' do
+        expect(@filemanager.is_layout? 'javascripts/main.min.js').to eq(false)
+      end
+    end
+  end
+
+  describe '#remove_local_file', focus: true do
+    before :each do
+      @filemanager.create_asset get_layout_asset
+    end
+
+    context 'with an existing file' do
+      it 'removes the file' do
+        old_asset_count = Dir['stylesheets/*'].count
+        @filemanager.remove_local_file 'stylesheets/test.css'
+        new_asset_count = Dir['stylesheets/*'].count
+        expect(old_asset_count - new_asset_count).to eq(1)
+      end
+      it 'returns true' do
+        expect(@filemanager.remove_local_file 'stylesheets/test.css').to eq(true)
+      end
+    end
+
+    context 'with an invalid filename' do
+      it 'doesn\'t remove anything' do
+        old_asset_count = Dir['stylesheets/*'].count
+        @filemanager.remove_local_file 'stylesheets/style.css'
+        new_asset_count = Dir['stylesheets/*'].count
+        expect(old_asset_count - new_asset_count).to eq(0)
+      end
+
+      it 'returns false' do
+        expect(@filemanager.remove_local_file 'stylesheets/style.css').to eq(false)
+      end
+
+    end
+  end
+
   describe '#remove_from_manifest' do
     before :all do
       @filemanager.generate_manifest(get_layouts, get_layout_assets)
@@ -329,19 +396,19 @@ describe Voog::Dtk::FileManager do
         Dir.delete('temp')
       end
       it 'returns false' do
-        expect(@filemanager.check).to be_false
+        expect(@filemanager.check).to eq(false)
       end
     end
 
     context 'with empty manifest.json and no files' do
-      it 'returns false' do
+      it 'returns true' do
         File.open('manifest.json', 'w+') do |file|
           file << {
             'layouts' => [],
             'assets' => []
           }.to_json
         end
-        expect(@filemanager.check).to be_false
+        expect(@filemanager.check).to eq(true)
       end
     end
 
@@ -359,7 +426,7 @@ describe Voog::Dtk::FileManager do
             'assets' => []
           }.to_json
         end
-        expect(@filemanager.check).to be_false
+        expect(@filemanager.check).to eq(false)
       end
     end
   end
@@ -386,7 +453,7 @@ describe Voog::Dtk::FileManager do
       end
 
       it 'returns false' do
-        expect(@filemanager.generate_local_manifest).to be_false
+        expect(@filemanager.generate_local_manifest).to eq(false)
       end
 
       it 'doesn\'t generate a manifest.json file' do
@@ -409,7 +476,7 @@ describe Voog::Dtk::FileManager do
 
       it 'generates a manifest file' do
         @filemanager.generate_local_manifest
-        expect(File.exists? 'manifest.json').to be_true
+        expect(File.exists? 'manifest.json').to eq(true)
         @manifest = @filemanager.read_manifest
       end
 
@@ -420,7 +487,7 @@ describe Voog::Dtk::FileManager do
       end
 
       it 'returns true' do
-        expect(@filemanager.generate_local_manifest).to be_true
+        expect(@filemanager.generate_local_manifest).to eq(true)
       end
     end
 
@@ -447,7 +514,7 @@ describe Voog::Dtk::FileManager do
         @filemanager.generate_local_manifest
         @manifest = @filemanager.read_manifest
         layout = @manifest['layouts'].first
-        expect(layout['component']).to be_false
+        expect(layout['component']).to eq(false)
         expect(layout['content_type']).to eq('page')
         expect(layout['file']).to eq('layouts/front_page.tpl')
         expect(layout['layout_name']).to eq('page_default')
@@ -455,7 +522,7 @@ describe Voog::Dtk::FileManager do
       end
 
       it 'returns true' do
-        expect(@filemanager.generate_local_manifest).to be_true
+        expect(@filemanager.generate_local_manifest).to eq(true)
       end
     end
   end
@@ -487,11 +554,11 @@ describe Voog::Dtk::FileManager do
       it 'removes the \'tmp\' directory' do
         @filemanager.fetch_boilerplate
         @files = Dir['*']
-        expect(@files.include? 'tmp').to be_false
+        expect(@files.include? 'tmp').to eq(false)
       end
 
       it 'returns true' do
-        expect(@filemanager.fetch_boilerplate).to be_true
+        expect(@filemanager.fetch_boilerplate).to eq(true)
       end
     end
 
@@ -521,7 +588,7 @@ describe Voog::Dtk::FileManager do
       end
 
       it 'returns true' do
-        expect(@return_value).to be_true
+        expect(@return_value).to eq(true)
       end
     end
   end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require_relative '../lib/voog/dtk/filemanager.rb'
 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.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler