voog-kit 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c9f1079f0ef59107da7b523f88cf7a443201e78
-  data.tar.gz: 315a4457e8b6801c2496a0f816dbfd7153be7b33
+  metadata.gz: 4d8f302218c12c39a550e03d9b6b4607ac45b7b1
+  data.tar.gz: fc4e9d0851bf63d22fd44b2a809df0ea4fad6f0f
 SHA512:
-  metadata.gz: aa86407a6dd8e34f0226bfe37503e3b405490533e0ea517c6661f83166db2de1a7f2fd6fde1e68bb72664bc2197af5b5bda622211292672cacaefe35a30c8b9e
-  data.tar.gz: a2d01697c7aaa0c530e9f538af1521618da54ca8c6fd03bf9e67eceea244d8989a1c2d6c568d4fc5aba796b2347fed9578116656fb777ba7a0b8c9661375c8ed
+  metadata.gz: ced86da8f72e62c1642798ba6ec39b86b01c805a1d943cf9ea6c04ac377f7d84e2c635a2c7b39eaf99e05b4d5d9fb3d548571413f21b7e69151d5f68b5e902c1
+  data.tar.gz: e3ae174c9d9e03bcd362751e5717462d693e495059af9fd349c4706fbf440340a73d28df076027b37417b885860d55de6dab01ad53c9ad055c591b9508ba97ed

data/bin/kit

@@ -25,7 +25,6 @@ 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.' }]
-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
@@ -51,7 +50,6 @@ 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
@@ -88,7 +86,6 @@ 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
@@ -98,16 +95,20 @@ command :check do |c|
 end
 
 desc 'Fetches the layout and layout asset files for the given site'
-long_desc 'If no arguments are provided, the \'pull\' command fetches all
+long_desc "If no arguments are provided, the 'pull' command fetches all
           layout files and layout assets and (re-)generates a manifest file.
-          If filenames are provided, it fetches only those and updates the
-          manifest with only those files. The provided names can be either
-          filenames or layout/component titles.'
+          If file or folder names are provided, it fetches any files matching the
+          given names and updates the manifest with those files. The provided 
+          names can be either folder names or full filenames. For layouts and 
+          components, the .tpl extension is optional.\n
+          Examples:\n
+          kit pull images stylesheets javascripts\n
+          kit pull images/image.png images/image.jpg\n
+          kit pull layouts/front_page components/news.tpl"
 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
@@ -132,7 +133,6 @@ 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
@@ -246,7 +246,6 @@ 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)
 
@@ -283,8 +282,7 @@ pre do |global, command, options, args|
   @filemanager = Voog::Dtk::FileManager.new(client, {
     silent: silent,
     verbose: verbose,
-    overwrite: overwrite,
-    cleanup: cleanup
+    overwrite: overwrite
   })
 end
 

data/lib/voog/dtk/filemanager.rb

@@ -235,7 +235,7 @@ module Voog::Dtk
       @notifier.info 'Reading local files...'
       layouts_dir = Dir.new('layouts')
       layouts = layouts_dir.entries.select do |file|
-        (file =~ /(.*)\.tpl/ && !File.directory?(File.join(layouts_dir, file)))
+        (!File.directory?(File.join(layouts_dir, file)) && valid_for_folder?(file, 'layouts'))
       end
       layouts = layouts.map do |l|
         attrs = {
@@ -253,7 +253,7 @@ module Voog::Dtk
       end
       components_dir = Dir.new('components')
       components = components_dir.entries.select do |file|
-        (file =~ /(.*)\.tpl/ && !File.directory?(File.join(components_dir, file)))
+        (!File.directory?(File.join(components_dir, file)) && valid_for_folder?(file, 'components'))
       end
       components = components.map do |c|
         name = c.split('.').first.gsub('_', ' ')
@@ -276,7 +276,7 @@ module Voog::Dtk
         next unless Dir.exist? dir
         current_dir = Dir.new(dir)
         current_dir.entries.each do |file|
-          next if File.directory?(File.join(current_dir, file))
+          next unless !File.directory?(File.join(current_dir, file)) && valid_for_folder?(file, dir)
           attrs = {
             'content_type' => begin
               MIME::Types.type_for(file).first.content_type
@@ -893,55 +893,56 @@ module Voog::Dtk
 
     def find_layouts(names)
       layouts = get_layouts
-      @manifest = read_manifest if File.exist? 'manifest.json'
       results = []
 
       names.each do |name|
-        name = name.split('/').last.split('.').first
-        if @manifest
-          layout = @manifest.fetch('layouts', []).reject(&:nil?).find{ |l| l['file'].split('/').last.split('.').first == name }
-          if layout # layout file is in manifest
-            layout = layouts.find { |l| l.title == layout['title'] }
-          else # not found in manifest
-            layout = layouts.find { |l| l.title == name }
-          end
-          id = layout.id if layout
+        case name
+        when /\Alayouts\/?\Z/
+          results << layouts.select { |l| !l.component }.map(&:id)
+        when /\Acomponents\/?\Z/
+          results << layouts.select { |l| l.component }.map(&:id)
         else
-          layout = layouts.find{ |l| l.title.gsub(/[^\w\.]/, '_').downcase == name}
-          id = layout['id'] if layout
+          type, name = name.gsub('.tpl', '').split('/')
+          results << layouts.select do |l|
+            (type == 'layouts' ? !l.component : l.component) && l.title.gsub(/[^\w\.]/, '_').downcase == name
+          end.map(&:id)
         end
-        results << id if id
       end
-
-      results
+      results.flatten
     end
 
     def find_assets(names)
       assets = get_layout_assets
       results = []
       names.each do |name|
-        name = name.split('/').last
-        layout = assets.find{ |l| l.filename == name }
-        results << layout.id if layout
+        case name
+        when /\Aassets\/?\Z/
+          results << assets.select { |a| a.asset_type == 'asset' }.map(&:id)
+        when /\Aimages\/?\Z/
+          results << assets.select { |a| a.asset_type == 'image' }.map(&:id)
+        when /\Ajavascripts\/?\Z/
+          results << assets.select { |a| a.asset_type == 'javascript' }.map(&:id)
+        when /\Astylesheets\/?\Z/
+          results << assets.select { |a| a.asset_type == 'stylesheet' }.map(&:id)
+        else
+          results << assets.select { |a| a.filename == name.split('/').last }.map(&:id)
+        end
       end
-      results
+      results.flatten
     end
 
     def pull_files(names)
-      # TODO: pull whole folders, e.g "pull images"
       layout_ids = find_layouts(names)
       asset_ids = find_assets(names)
 
       found = layout_ids.length + asset_ids.length
-      if found > 0 && found < names.length
-        @notifier.warning 'Unable to find some specified files!'
+
+      unless found
+        @notifier.error "Unable to find any files matching the given pattern#{'s' if names.length > 1}!"
         @notifier.newline
-        ret = true
-      elsif found == names.length
-        ret = true
-      elsif found == 0
-        @notifier.error 'Unable to find any specified files!'
         ret = false
+      else
+        ret = true
       end
 
       create_layouts(layout_ids) unless layout_ids.empty?
@@ -949,6 +950,7 @@ module Voog::Dtk
 
       ret
     end
+
     def display_sites(sites)
       sites.each_with_index do |site, index|
         @notifier.info "#{site.fetch(:name)} #{'(default)' if index == 0}"

data/lib/voog/dtk/version.rb

@@ -1,5 +1,5 @@
 module Voog
   module Dtk
-    VERSION = '0.3.1'
+    VERSION = '0.3.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler