voog-kit 0.2.3 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f989cd5ef93ad83de52a35f6529bc233f186e1
-  data.tar.gz: 98924d5947e7ceca25172f763aed37e5de5cebce
+  metadata.gz: 6a2272da9fd83bf225e3f78ae2b1cab6efb6823f
+  data.tar.gz: f070ed157d1e875e409e47887d86b15acaa43111
 SHA512:
-  metadata.gz: 2a36764dfa04dc9d3df2ab23483a0928fb0c93891c15b3083f2a2f357f4684e5f23086423c43a849417574d0c7bb37f361025c548f3881f86c96948603faac8b
-  data.tar.gz: b1dadd5e5a7ea43b7a43f2c53245ad33488b44c1766724fa04ca07eaf74ea1b0ec4be369fbaa9277a502775fe9b3e1be262efd62830858b9db1a4b2c62b34740
+  metadata.gz: b9fe5dd1a8b2871e254bf1b2550d1d11a6e9d6a6a18706f93ae2ff316dc89b18c5cd73add73c90ec77152e2aa06e5040cb4783d9d04cd5f6ba3f4ca5558a0b7f
+  data.tar.gz: efdcffbc79f82d2f38a2f19888d749b15a16ba34e19ad0d6bb3ff002f84ceb7e0c8fbbfed4bbba3f27225d94b6c07c76ff25ddd19131c9b686bf7a344d46d934

data/Guardfile

@@ -0,0 +1,6 @@
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/voog/dtk/(.+)\.rb$})     { |m| puts m.inspect;"spec/models/dtk/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end
+

data/README.markdown

@@ -107,6 +107,7 @@ same as before. To stop watching, just type "exit" or press Ctrl+D.
 * `check`    - Cross-checks the generated manifest to your local files to see if anything is missing
 * `pull`     - Fetches the layout and layout asset files for the given site
 * `push`     - Synchronizes your local changes with Voog
+* `remove`   - Removes both local and remote files
 * `watch`    - Watches for file changes in the current directory
 * `help`     - Shows a list of commands or help for one command
 
@@ -159,6 +160,11 @@ and the *MainMenu* component.
 site, overwriting existing files. Although `pull` searches by filename, `push` arguments need to be local file paths.
 For example, `kit push images/shadow.png layouts/mainmenu.tpl` works, `kit push shadow.png MainMenu` does not.
 
+### remove
+`kit remove` first checks if the provided filename is valid, then removes it from the manifest. After that it deletes 
+the local file and sends an API request to delete the remote file as well. The directory name must be included in the
+file name, e.g **assets/icon.svg** is valid, but **assets/** or **search.svg** is not.
+
 ### watch
 
 This command starts a watcher that monitors the current folder and its subfolders and triggers `kit push` every time

data/bin/kit

@@ -55,11 +55,15 @@ command :init do |c|
   c.flag *hostname_args
   c.flag *api_token_args
   c.flag *site_args
+
+  c.desc 'Initializes the local project folder with remote layout files'
   c.action do |global_options, options, args|
     @filemanager.create_folders
     @filemanager.create_files
+    @filemanager.generate_remote_manifest
   end
 
+  c.desc 'Creates empty folders for a new project'
   c.command :empty do |e|
     e.action do |e|
       Voog::Dtk.write_config('','',false)
@@ -67,9 +71,14 @@ command :init do |c|
     end
   end
 
+  c.desc 'Initializes the local project folder with boilerplate files and folders'
   c.command :new do |n|
-    n.action do |n|
-      @filemanager.fetch_boilerplate
+    n.action do |global_options, options, args|
+      if args.size
+        @filemanager.clone_design args.first
+      else
+        @filemanager.clone_design
+      end
     end
   end
 end
@@ -133,7 +142,7 @@ command :push do |c|
 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
+long_desc 'This command removes a local file, removes it from the manifest and sends a delete
           request to remove it from the remote site as well.'
 command :remove do |c|
   c.switch *debug_args
@@ -147,6 +156,21 @@ command :remove do |c|
   end
 end
 
+desc 'Adds a specific file to the manifest and syncs it with the remote site'
+long_desc 'This command creates a new file, adds it to the manifest and creates
+          a new file on the remote site as well.'
+command :add 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.add_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
@@ -178,11 +202,29 @@ command :manifest do |c|
   end
 end
 
+desc "Displays a list of all known sites that are defined in .voog files"
+long_desc "The 'sites' command displays a list of all sites that are defined in
+          .voog files, either in the local project folder, or in the user's hostname
+          folder. Local sites are preferred over global ones."
+command :sites 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
+  c.action do |global_options, options, args|
+    @filemanager.display_sites(Voog::Dtk.read_config(:all))
+  end
+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'."
+          file, respectively. When local files are deleted, their remote counterparts
+          are also deleted. You can exit by pressing Ctrl+D or typing 'q' or 'exit'."
 command :watch do |c|
   c.switch *debug_args
   c.switch *verbose_args

data/lib/voog/dtk/filemanager.rb

@@ -8,6 +8,9 @@ require 'mime/types'
 module Voog::Dtk
   class FileManager
     attr_accessor :notifier
+
+    BOILERPLATE_URL = 'git@github.com:Edicy/design-boilerplate.git'
+
     def initialize(client, opts = {})
       @client = client
       @silent = opts.fetch(:silent, false)
@@ -18,35 +21,79 @@ module Voog::Dtk
     end
 
     def read_manifest
-      JSON.parse(File.read('manifest.json', :encoding => 'UTF-8')).to_h
+      JSON.parse(File.read('manifest.json', encoding: 'UTF-8')).to_h
     end
 
     def write_manifest(manifest)
-      File.open('manifest.json', 'w+', :encoding => 'UTF-8') do |file|
+      File.open('manifest.json', 'w+', encoding: 'UTF-8') do |file|
         file << JSON.pretty_generate(manifest)
       end
     end
 
-    def in_manifest?(file, manifest=nil)
+    def in_manifest?(file, manifest = nil)
       @manifest = manifest || read_manifest
-      filenames = @manifest['layouts'].map{|l| l.fetch('file', '')}
-      filenames += @manifest['assets'].map{|a| a.fetch('filename', '')}
+      filenames = @manifest['layouts'].map { |l| l.fetch('file', '') }
+      filenames += @manifest['assets'].map { |a| a.fetch('filename', '') }
       filenames.include? file
     end
 
+    def valid_for_folder?(filename, folder)
+      return false unless (filename && folder)
+
+      # discard dotfiles
+      return false if filename.match(/\A[\.]{1}.+\z/)
+
+      mimetype = MIME::Types.of(filename).first
+      media_type = mimetype.media_type if mimetype
+      sub_type = mimetype.sub_type if mimetype
+
+      case folder
+      when 'images'
+        # SVG files are assets, not images
+        (media_type == 'image') && (sub_type != 'svg+xml')
+      when 'javascripts'
+        # Allow only pure JS files
+        (media_type == 'application') && (sub_type == 'javascript')
+      when 'stylesheets'
+        # Only pure CSS files, not SCSS/LESS etc.
+        (media_type == 'text') && (sub_type == 'css')
+      when 'layouts'
+        # Allow only files with .tpl extension
+        /\A[^\.]+\.tpl\z/.match(filename) && true
+      when 'components'
+        # Allow only files with .tpl extension
+        /\A[^\.]+\.tpl\z/.match(filename) && true
+      else
+        true
+      end
+    end
+
     def add_to_manifest(files = nil)
       return if files.nil?
       @manifest = read_manifest
+
+      new_layouts = []
+      new_assets = []
+
       files = (files.is_a? String) ? [files] : files
       files.uniq.each do |file|
         next if in_manifest?(file, @manifest)
+
         match = /^(component|layout|image|javascript|asset|stylesheet)s\/(.*)/.match(file)
         next if match.nil?
+
         type, filename = match[1], match[2]
+
+        unless valid_for_folder?(filename, "#{type}s")
+          @notifier.error "Invalid filename '#{filename}' for '#{type}s' folder. Skipping.\n"
+          next
+        end
+
         if %w(component layout).include? type
           component = type == 'component'
           name = filename.split('.').first
           title = component ? name : name.gsub('_', ' ').capitalize
+
           layout = {
             'title' => component ? name : title,
             'layout_name' => name,
@@ -54,7 +101,8 @@ module Voog::Dtk
             'component' => component,
             'file' => file
           }
-          @manifest['layouts'] << layout
+
+          new_layouts << layout
         elsif %w(image javascript asset stylesheet).include? type
           asset = {
             'content_type' => begin
@@ -66,13 +114,21 @@ module Voog::Dtk
             'file' => file,
             'filename' => filename
           }
-          @manifest['assets'] << asset  
+
+          new_assets << asset
         end
-        @notifier.newline
+
         @notifier.info "Added #{file} to manifest.json"
+        @notifier.newline
       end
+
+      new_layouts.map { |l| @manifest['layouts'] << l }
+      new_assets.map { |a| @manifest['assets'] << a }
+
       write_manifest @manifest
-      @notifier.newline
+
+      # returns all successfully added files
+      new_layouts + new_assets
     end
 
     def remove_from_manifest(files = nil)
@@ -102,11 +158,11 @@ module Voog::Dtk
     end
 
     def get_layouts
-      @client.layouts(per_page: 10000)
+      @client.layouts(per_page: 10_000)
     end
 
     def get_layout_assets
-      @client.layout_assets(per_page: 10000)
+      @client.layout_assets(per_page: 10_000)
     end
 
     def get_layout(id)
@@ -163,53 +219,53 @@ module Voog::Dtk
       end
     end
 
-    def generate_local_manifest(verbose=false, silent=false)
-      unless %w(layouts components).map { |f| Dir.exists? f }.all?
-        @notifier.error 'Cannot find any local layout files! (See `kit help init`)'
+    def generate_local_manifest(verbose = false, silent=false)
+      unless %w(layouts components).map { |f| Dir.exist? f }.all?
+        @notifier.error 'Missing local layout folders! (See `kit help init`)'
         return false
       end
 
       begin
-        @old_manifest = JSON.parse(File.read('manifest.json', :encoding => 'UTF-8')).to_h if File.exists? 'manifest.json'
-      rescue JSON::ParserError => e
-        @notifier.error "Invalid JSON in current manifest file!"
+        @old_manifest = JSON.parse(File.read('manifest.json', encoding: 'UTF-8')).to_h if File.exist? 'manifest.json'
+      rescue JSON::ParserError
+        @notifier.error 'Invalid JSON in current manifest file!'
         @notifier.newline
       end
 
       @notifier.info 'Reading local files...'
       layouts_dir = Dir.new('layouts')
       layouts = layouts_dir.entries.select do |file|
-        file =~ /(.*)\.tpl/
+        (file =~ /(.*)\.tpl/ && !File.directory?(File.join(layouts_dir, file)))
       end
       layouts = layouts.map do |l|
         attrs = {
-          "content_type" =>  "page",
-          "component" => false,
-          "file" => "layouts/#{l}",
-          "layout_name" => "page_default",
-          "title" => l.split(".").first.gsub('_', " ").capitalize
+          'content_type' =>  'page',
+          'component' => false,
+          'file' => "layouts/#{l}",
+          'layout_name' => 'page_default',
+          'title' => l.split('.').first.gsub('_', ' ').capitalize
         }
         if @old_manifest && @old_manifest.fetch('layouts')
-          old_layout = @old_manifest.fetch('layouts').reject(&:nil?).select { |ol| ol.fetch('file').include? l}.first || {}
+          old_layout = @old_manifest.fetch('layouts').reject(&:nil?).select { |ol| ol.fetch('file').include? l }.first || {}
           attrs.merge! old_layout
         end
         attrs
       end
       components_dir = Dir.new('components')
       components = components_dir.entries.select do |file|
-        file =~/(.*)\.tpl/
+        (file =~ /(.*)\.tpl/ && !File.directory?(File.join(components_dir, file)))
       end
       components = components.map do |c|
-        name = c.split(".").first.gsub('_', ' ')
+        name = c.split('.').first.gsub('_', ' ')
         attrs = {
-          "content_type" => "component",
-          "component" => true,
-          "file" => "components/#{c}",
-          "layout_name" => name,
-          "title" => name
+          'content_type' => 'component',
+          'component' => true,
+          'file' => "components/#{c}",
+          'layout_name' => name,
+          'title' => name
         }
         if @old_manifest && @old_manifest.fetch('layouts')
-          old_component = @old_manifest.fetch('layouts').reject(&:nil?).select { |ol| ol.fetch('file').include? c}.first || {}
+          old_component = @old_manifest.fetch('layouts').reject(&:nil?).select { |ol| ol.fetch('file').include? c }.first || {}
           attrs.merge! old_component
         end
         attrs
@@ -217,38 +273,39 @@ module Voog::Dtk
       assets = []
       asset_dirs = %w(assets images javascripts stylesheets)
       asset_dirs.each do |dir|
-        next unless Dir.exists? dir
+        next unless Dir.exist? dir
         current_dir = Dir.new(dir)
         current_dir.entries.each do |file|
-          next if file =~ /^\.\.?$/
+          next if File.directory?(File.join(current_dir, file))
           attrs = {
-            "content_type" => begin
+            'content_type' => begin
               MIME::Types.type_for(file).first.content_type
             rescue
               'text/unknown'
             end,
-            "file" => "#{dir}/#{file}",
-            "kind" => dir,
-            "filename" => file
+            'file' => "#{dir}/#{file}",
+            'kind' => dir,
+            'filename' => file
           }
           if @old_manifest && @old_manifest.fetch('assets')
-            old_asset = @old_manifest.fetch('assets').reject(&:nil?).select { |ol| ol.fetch('file').include? file}.first || {}
+            old_asset = @old_manifest.fetch('assets').reject(&:nil?).select { |ol| ol.fetch('file').include? file }.first || {}
             attrs.merge! old_asset
           end
           assets << attrs
         end
       end
+
       manifest = {
-        "description" => "New design",
-        "name" => "New design",
-        "preview_medium" => "",
-        "preview_small" => "",
-        "author" => "",
-        "layouts" => layouts + components,
-        "assets" => assets
+        'description' => "New design",
+        'name' => "New design",
+        'preview_medium' => "",
+        'preview_small' => "",
+        'author' => "",
+        'layouts' => sort_layouts_by_content_type(layouts + components),
+        'assets' => assets
       }
       if @old_manifest
-        old_meta = @old_manifest.tap{ |m| m.delete("assets") }.tap{ |m| m.delete("layouts") }
+        old_meta = @old_manifest.tap{ |m| m.delete('assets') }.tap{ |m| m.delete('layouts') }
         manifest.merge! old_meta
       end
       @notifier.newline
@@ -256,18 +313,35 @@ module Voog::Dtk
       write_manifest(manifest)
       @notifier.success 'Done!'
       @notifier.newline
-      return true
+      true
     end
 
     def generate_remote_manifest
       generate_manifest get_layouts, get_layout_assets
     end
 
+    def sort_layouts_by_content_type(layouts)
+      # make sure that 'blog' is before 'blog_article' and 'elements' is before 'element'
+      preferred_order = %w(page blog blog_article elements element error_401 error_404 photoset component)
+
+      layouts.sort do |a, b|
+        preferred_order.index(a.fetch('content_type')) <=> preferred_order.index(b.fetch('content_type'))
+      end
+    end
+
     def generate_manifest(layouts = nil, layout_assets = nil)
-      layouts = layouts || get_layouts
-      layout_assets = layout_assets || get_layout_assets
+      layouts ||= get_layouts
+      layout_assets ||= get_layout_assets
 
-      unless (layouts && layout_assets && !layouts.empty? && !layout_assets.empty?)
+      # type->folder map for layout assets
+      asset_folders = {
+        'asset' => 'assets',
+        'javascript' => 'javascripts',
+        'stylesheet' => 'stylesheets',
+        'image' => 'images'
+      }
+
+      if (layouts.empty? && layout_assets.empty?)
         @notifier.error 'No remote layouts found to generate manifest from!'
         @notifier.newline
         return false
@@ -280,7 +354,9 @@ module Voog::Dtk
       end
 
       @notifier.info 'Writing remote layouts to new manifest.json file...'
-      manifest = Hash.new
+
+      manifest = {}
+
       manifest[:layouts] = layouts.inject(Array.new) do |memo, l|
         memo << {
           title: l.title,
@@ -291,14 +367,16 @@ module Voog::Dtk
         }
       end
 
+      manifest[:layouts] = sort_layouts_by_content_type(manifest[:layouts])
+
       manifest[:assets] = layout_assets.inject(Array.new) do |memo, a|
-        folder = if %w(unknown font).include? a.asset_type
-          "assets"
-        else
-          "#{a.asset_type}s"
-        end
+
+        # kind is same as asset_type for kinds that are represented in the asset_folders hash, defaults to 'asset'
+        kind = asset_folders.key?(kind.to_s) ? a.asset_type : 'asset'
+        folder = asset_folders.fetch(kind, 'assets')
+
         memo << {
-          kind: a.asset_type,
+          kind: kind,
           filename: a.filename,
           file: "#{folder}/#{a.filename}",
           content_type: a.content_type
@@ -314,7 +392,7 @@ module Voog::Dtk
       @notifier.newline
       @notifier.info 'Creating folder structure...'
       folders = %w(stylesheets images assets javascripts components layouts)
-      folders.each { |folder| Dir.mkdir(folder) unless Dir.exists?(folder) }
+      folders.each { |folder| Dir.mkdir(folder) unless Dir.exist?(folder) }
       @notifier.success 'Done!'
       @notifier.newline
     end
@@ -353,12 +431,12 @@ module Voog::Dtk
       }
 
       if valid
-      folder = folder_names.fetch(asset.asset_type, 'assets')
+        folder = folder_names.fetch(asset.asset_type, 'assets')
 
-        Dir.mkdir(folder) unless Dir.exists?(folder)
+        Dir.mkdir(folder) unless Dir.exist?(folder)
         Dir.chdir(folder)
 
-        overwritten = File.exists? asset.filename
+        overwritten = File.exist? asset.filename
 
         if @verbose
           @notifier.newline
@@ -382,9 +460,7 @@ module Voog::Dtk
         end
         Dir.chdir('..')
       else
-        unless @verbose
-          @notifier.error '!'
-        end
+        @notifier.error '!' unless @verbose
       end
     end
 
@@ -408,7 +484,7 @@ module Voog::Dtk
         folder = layout.component ? 'components' : 'layouts'
         filename = "#{layout.title.gsub(/[^\w\.\-]/, '_').downcase}.tpl"
         Dir.chdir(folder)
-        overwritten = File.exists? filename
+        overwritten = File.exist? filename
 
         if @verbose
           @notifier.newline
@@ -425,18 +501,16 @@ module Voog::Dtk
 
         Dir.chdir('..')
       else
-        unless @verbose
-          @notifier.error '!'
-        end
+        @notifier.error '!' unless @verbose
       end
     end
 
     def check
-      ok_char = "."
-      not_ok_char = "!"
-      @notifier.info "Checking manifest.json..."
+      ok_char = '.'
+      not_ok_char = '!'
+      @notifier.info 'Checking manifest.json...'
 
-      if File.exists? 'manifest.json'
+      if File.exist? 'manifest.json'
         @manifest = read_manifest
         @notifier.success 'OK!'
       else
@@ -449,9 +523,9 @@ module Voog::Dtk
       missing_layouts = %w()
 
       @notifier.newline
-      @notifier.info "Checking layouts and components"
+      @notifier.info 'Checking layouts and components'
       layouts.reject(&:nil?).each do |layout|
-        if File.exists? layout['file']
+        if File.exist? layout['file']
           @notifier.success ok_char
         else
           missing_layouts << layout['file']
@@ -474,9 +548,9 @@ module Voog::Dtk
       missing_assets = %w()
 
       @notifier.newline
-      @notifier.info "Checking assets"
+      @notifier.info 'Checking assets'
       assets.reject(&:nil?).each do |asset|
-        if File.exists? asset['file']
+        if File.exist? asset['file']
           @notifier.success ok_char
         else
           missing_assets << asset['file']
@@ -495,29 +569,42 @@ module Voog::Dtk
         @notifier.success 'OK!'
       end
 
-      return (missing_assets.count + missing_layouts.count == 0)
+      (missing_assets.count + missing_layouts.count == 0)
     end
 
-    def fetch_boilerplate(dst='tmp')
-      @notifier.info 'Fetching design boilerplate...'
-      @notifier.newline
+    def clone_design(url = BOILERPLATE_URL, dst = 'tmp')
+      # Allow only design repositories from Edicy/Voog for now
+      pattern = /\Ahttps?:\/\/github.com\/(?:Voog|Edicy)\/design-(\w+)\.git\z/ # HTTPS clone URL
+      pattern2 = /\Agit@github.com:(?:Voog|Edicy)\/design-(\w+)\.git\z/ # SSH clone URL
+
+      match = url.match(pattern) || url.match(pattern2)
 
-      FileUtils.rm_r 'tmp' if Dir.exists? 'tmp'
+      unless match.nil?
+        @notifier.info "Fetching the #{match[1].capitalize} design..."
+        @notifier.newline
+      else
+        # default to the boilerplate URL if given URL doesn't match the Regex pattern
+        @notifier.info 'Fetching design boilerplate...'
+        @notifier.newline
+        url = BOILERPLATE_URL
+      end
+
+      FileUtils.rm_r 'tmp' if Dir.exist? 'tmp'
 
       begin
-        Git.clone 'git@github.com:Edicy/design-boilerplate.git', dst
+        Git.clone url, dst
       rescue
         @notifier.error 'An error occurred!'
         return false
       end
 
-      if Dir.exists? 'tmp'
+      if Dir.exist? 'tmp'
         Dir.chdir 'tmp'
-        @notifier.info 'Copying boilerplate files to working directory...'
+        @notifier.info 'Copying template files to working directory...'
         @notifier.newline
         Dir.new('.').entries.each do |f|
           unless f =~ /^\..*$/
-            if Dir.exists?('../' + f) || File.exists?('../' + f)
+            if Dir.exist?('../' + f) || File.exist?('../' + f)
               FileUtils.rm_r '../' + f
             end
             FileUtils.mv f, '..'
@@ -528,11 +615,11 @@ module Voog::Dtk
       end
       @notifier.success 'Done!'
       @notifier.newline
-      return true
+      true
     end
 
     # Returns filename=>id hash for layout files
-    def layout_id_map(layouts=nil)
+    def layout_id_map(layouts = nil)
       layouts ||= get_layouts
       remote_layouts = layouts.inject(Hash.new) do |memo, l|
         memo[l.title.downcase] = l.id
@@ -540,11 +627,11 @@ module Voog::Dtk
       end
 
       @manifest = read_manifest
-      fail "Manifest not found! (See `kit help push` for more info)".red unless @manifest
+      fail 'Manifest not found! (See `kit help push` for more info)'.red unless @manifest
       layouts = @manifest.fetch('layouts').reject(&:nil?)
       layouts.inject(Hash.new) do |memo, l|
-        remote_exists = remote_layouts.key?(l.fetch('title').downcase)
-        memo[l.fetch('file')] = remote_layouts.fetch(l.fetch('title').downcase, nil) if remote_exists
+        remote_exist = remote_layouts.key?(l.fetch('title').downcase)
+        memo[l.fetch('file')] = remote_layouts.fetch(l.fetch('title').downcase, nil) if remote_exist
         memo
       end
     end
@@ -570,9 +657,9 @@ module Voog::Dtk
       # Find if provided file is a directory instead
       files.each_with_index do |file, index|
         next if file.is_a? Array
-        if Dir.exists? file
+        if Dir.exist? file
           subfiles = Dir.new(file).entries.reject{|e| e =~ /^(\.|\.\.)$/ } # Keep only normal subfiles
-          subfiles.map!{ |subfile| subfile = "#{file[/[^\/]*/]}/#{subfile}"} # Prepend folder name
+          subfiles.map! { |subfile| subfile = "#{file[/[^\/]*/]}/#{subfile}" } # Prepend folder name
           files[index] = subfiles # Insert as Array so sub-subfolders won't get processed again
         end
       end
@@ -590,7 +677,7 @@ module Voog::Dtk
               if local_layouts.include?(file)
                 if layouts.key?(file)
                   @notifier.info "Updating layout file #{file}..."
-                  if update_layout(layouts[file], File.read(file, :encoding => 'UTF-8'))
+                  if update_layout(layouts[file], File.read(file, encoding: 'UTF-8'))
                     @notifier.success 'OK!'
                   else
                     @notifier.error "Cannot update layout file #{file}!"
@@ -612,7 +699,7 @@ module Voog::Dtk
                 if layout_assets.key? file
                   if is_editable?(file)
                     @notifier.info "Updating layout asset file #{file}..."
-                    if update_layout_asset(layout_assets[file], File.read(file, :encoding => 'UTF-8'))
+                    if update_layout_asset(layout_assets[file], File.read(file, encoding: 'UTF-8'))
                       @notifier.success 'OK!'
                     else
                       @notifier.error "Unable to update file #{file}!"
@@ -641,7 +728,7 @@ module Voog::Dtk
               else
                 @notifier.warning "Asset file #{file} not found in manifest! Skipping."
               end
-            elsif Dir.exists? file
+            elsif Dir.exist? file
               @notifier.warning "Not allowed to push subfolder #{file}!"
             else
               @notifier.warning "Not allowed to push file #{file}!"
@@ -673,7 +760,7 @@ module Voog::Dtk
         end
       else
         if folder == 'images'
-          "image/#{file.split("/").last.split(".").last}"
+          "image/#{file.split('/').last.split('.').last}"
         elsif folder == 'assets'
           'unknown/unknown'
         end
@@ -681,7 +768,7 @@ module Voog::Dtk
     end
 
     def create_remote_layout(file)
-      @manifest = read_manifest if File.exists? 'manifest.json'
+      @manifest = read_manifest if File.exist? 'manifest.json'
       layouts = @manifest.fetch('layouts', []).reject(&:nil?)
       layout = layouts.select { |l| file == l.fetch('file') }.first
 
@@ -690,12 +777,12 @@ module Voog::Dtk
           title: layout.fetch('title'),
           content_type: layout.fetch('content_type'),
           component: layout.fetch('component'),
-          body: File.exists?(layout.fetch('file')) ? File.read(layout.fetch('file'), :encoding => 'UTF-8') : ''
+          body: File.exist?(layout.fetch('file')) ? File.read(layout.fetch('file'), encoding: 'UTF-8') : ''
         }
       else
         name = file.split('/').last.split('.').first
         component = (file.split('/').first =~ /^layouts$/).nil?
-        body = File.read(file, :encoding => 'UTF-8')
+        body = File.read(file, encoding: 'UTF-8')
         data = {
           title: component ? name : name.capitalize,
           content_type: 'page',
@@ -714,7 +801,7 @@ module Voog::Dtk
       }
 
       if is_editable?(file)
-        data[:data] = File.read(file, :encoding => 'UTF-8')
+        data[:data] = File.read(file, encoding: 'UTF-8')
       else
         data[:file] = file
       end
@@ -724,43 +811,28 @@ module Voog::Dtk
 
     def is_asset?(filename)
       asset_folders = %w(assets images stylesheets javascripts)
-      return File.file?(filename) && asset_folders.include?(filename.split('/').first)
+      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)
+      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
+        remove_local_file(name) if File.file?(name)
+        remove_remote_file(name)
+        remove_from_manifest(name)
         @notifier.newline
       end
     end
 
+    def add_files(names)
+      new_files = add_to_manifest names
+      upload_files new_files.map { |f| f.fetch('file') } unless new_files.empty?
+    end
+
     def remove_local_file(file)
       if File.exist?(file) && File.delete(file)
         @notifier.info "Removed local file #{file}." unless @silent
@@ -773,6 +845,40 @@ module Voog::Dtk
       end
     end
 
+    def remove_remote_file(file)
+      folder, filename = file.split('/')
+      return unless (folder && filename)
+
+      asset_ids = layout_asset_id_map
+      layout_ids = layout_id_map
+
+      if is_asset? file
+        id = asset_ids.fetch(file, nil)
+
+        unless id.nil?
+          if delete_layout_asset(id)
+            @notifier.info "Removed remote asset '#{filename}'." unless @silent
+          else
+            @notifier.error "Failed to remove remote asset '#{filename}'!" unless @silent
+          end
+        end
+      elsif is_layout? file
+        filename = filename.gsub('.tpl', '')
+        id = layout_ids.fetch(file, nil)
+
+        unless id.nil?
+          if delete_layout(id)
+            @notifier.info "Removed remote layout '#{filename}'." unless @silent
+          else
+            @notifier.error "Failed to remove remote layout '#{file}'!" unless @silent
+          end
+        end
+      else
+        @notifier.error "Invalid filename: '#{file}'"
+      end
+      @notifier.newline
+    end
+
     def uploadable?(file)
       if file.is_a? String
         !(file =~ /^(component|layout|image|asset|javascript|stylesheet)s\/([^\s]+)/).nil?
@@ -780,7 +886,7 @@ module Voog::Dtk
         begin
           uploadable? file.try(:to_s)
         rescue
-          fail "Cannot upload file '#{file}'!".red
+          raise "Cannot upload file '#{file}'!".red
         end
       end
     end
@@ -795,9 +901,9 @@ module Voog::Dtk
         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'] }
+            layout = layouts.find { |l| l.title == layout['title'] }
           else # not found in manifest
-            layout = layouts.find{ |l| l.title == name }
+            layout = layouts.find { |l| l.title == name }
           end
           id = layout.id if layout
         else
@@ -828,13 +934,13 @@ module Voog::Dtk
 
       found = layout_ids.length + asset_ids.length
       if found > 0 && found < names.length
-        @notifier.warning "Unable to find some specified files!"
+        @notifier.warning 'Unable to find some specified files!'
         @notifier.newline
         ret = true
       elsif found == names.length
         ret = true
       elsif found == 0
-        @notifier.error "Unable to find any specified files!"
+        @notifier.error 'Unable to find any specified files!'
         ret = false
       end
 
@@ -843,5 +949,17 @@ 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}"
+        if @verbose
+          @notifier.newline
+          @notifier.info "  host: #{site.fetch(:host)}"
+          @notifier.newline
+          @notifier.info "  token: #{site.fetch(:api_token)}"
+        end
+        @notifier.newline
+      end
+    end
   end
 end

data/lib/voog/dtk/guard.rb

@@ -97,8 +97,7 @@ module Voog::Dtk
     # @return [Object] the task result
     #
     def run_on_additions(paths)
-      @filemanager.add_to_manifest paths
-      @filemanager.upload_files paths
+      @filemanager.add_files paths
     rescue => e
       @filemanager.notifier.newline
       Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
@@ -111,8 +110,7 @@ module Voog::Dtk
     # @return [Object] the task result
     #
     def run_on_removals(paths)
-      @filemanager.remove_from_manifest paths
-      # @filemanager.delete_remote_files paths
+      @filemanager.remove_files paths
     rescue => e
       @filemanager.notifier.newline
       Voog::Dtk.handle_exception e, @debug, @filemanager.notifier

data/lib/voog/dtk/version.rb

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

data/lib/voog/dtk.rb

@@ -25,11 +25,14 @@ module Voog
         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 : {}
 
-        options = global_config.merge(local_config)
+        options = local_config.merge(global_config)
 
         unless options.empty?
-          @block = if block.nil?
+          @block = case block
+          when nil
             options.keys.first
+          when :all
+            options.keys
           else
             if options.key?(block)
               block
@@ -38,9 +41,20 @@ module Voog
             end
           end
 
-          config[:host] = options[@block].fetch("host")
-          config[:api_token] = options[@block].fetch("api_token")
-          config[:overwrite] = options[@block].fetch("overwrite", false) == 'true' ? true : false
+          if @block.is_a?(Array) && @block.size
+            config = []
+            @block.each do |site|
+              config << {
+                name: site,
+                host: options[site].fetch('host'),
+                api_token: options[site].fetch('api_token')
+              }
+            end
+          else
+            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
         end
         config
       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: true, verbose: true, overwrite: false})
+    @filemanager = Voog::Dtk::FileManager.new(nil, {silent: false, verbose: true, overwrite: false})
     @dir = Dir.new('.')
   end
 
@@ -283,7 +283,7 @@ describe Voog::Dtk::FileManager do
     end
   end
 
-  describe '#is_asset?', focus: true do
+  describe '#is_asset?' do
     before :all do
       @filemanager.create_folders
       @filemanager.create_asset get_layout_asset
@@ -302,7 +302,7 @@ describe Voog::Dtk::FileManager do
     end
   end
 
-  describe '#is_layout?', focus: true do
+  describe '#is_layout?' do
     before :all do
       @filemanager.create_layout get_layout
     end
@@ -319,7 +319,7 @@ describe Voog::Dtk::FileManager do
     end
   end
 
-  describe '#remove_local_file', focus: true do
+  describe '#remove_local_file' do
     before :each do
       @filemanager.create_asset get_layout_asset
     end
@@ -417,11 +417,11 @@ describe Voog::Dtk::FileManager do
         @manifest = File.open('manifest.json', 'w+') do |file|
           file << {
             'layouts' => [{
-              "component" => false,
-              "content_type" => "page",
-              "file" => "layouts/front_page.tpl",
-              "layout_name" => "page_front",
-              "title" => "Front page"
+              'component' => false,
+              'content_type' => 'page',
+              'file' => "layouts/front_page.tpl",
+              'layout_name' => 'page_front',
+              'title' => "Front page"
             }],
             'assets' => []
           }.to_json
@@ -527,7 +527,7 @@ describe Voog::Dtk::FileManager do
     end
   end
 
-  describe '#fetch_boilerplate' do
+  describe '#clone_design' do
     context 'with no files in the working directory' do
       before :each do
         @prev_files = Dir['*']
@@ -540,7 +540,7 @@ describe Voog::Dtk::FileManager do
       end
 
       it 'downloads and copies the boilerplate files' do
-        @filemanager.fetch_boilerplate
+        @filemanager.clone_design
         @files = Dir['*']
         expected_files = [
           'assets', 'images',
@@ -552,13 +552,13 @@ describe Voog::Dtk::FileManager do
       end
 
       it 'removes the \'tmp\' directory' do
-        @filemanager.fetch_boilerplate
+        @filemanager.clone_design
         @files = Dir['*']
         expect(@files.include? 'tmp').to eq(false)
       end
 
       it 'returns true' do
-        expect(@filemanager.fetch_boilerplate).to eq(true)
+        expect(@filemanager.clone_design).to eq(true)
       end
     end
 
@@ -569,7 +569,7 @@ describe Voog::Dtk::FileManager do
         File.open('manifest.json', 'w+') do |file| file << "[]" end
         @old_manifest = File.open('manifest.json')
         Dir.mkdir('test')
-        @return_value = @filemanager.fetch_boilerplate
+        @return_value = @filemanager.clone_design
         @manifest = File.open('manifest.json')
       end
 
@@ -593,6 +593,42 @@ describe Voog::Dtk::FileManager do
     end
   end
 
+  describe '#valid_for_folder?' do
+    it 'returns true for valid folder+filename combinations' do
+      testfiles = {
+        'stylesheets' => ['style.css', 'style.min.css'],
+        'javascripts' => ['script.js', 'script.min.js'],
+        'images' => ['image.jpg', 'image.png'],
+        'assets' => ['icon.svg', 'text.txt'],
+        'components' => ['menu.tpl'],
+        'layouts' => ['front_page.tpl']
+      }
+
+      testfiles.each do |folder, files|
+        files.each do |filename|
+          expect(@filemanager.valid_for_folder? filename, folder).to be_true
+        end
+      end
+    end
+
+    it 'returns false for invalid folder+filename combinations' do
+      testfiles = {
+        'stylesheets' => ['style.css.map', 'style.scss', 'style.less'],
+        'javascripts' => ['script.js.map', 'script.coffee'],
+        'images' => ['icon.svg'],
+        'assets' => ['.gitignore'],
+        'components' => ['test', 'style.css'],
+        'layouts' => ['test', 'script.js']
+      }
+
+      testfiles.each do |folder, files|
+        files.each do |filename|
+          expect(@filemanager.valid_for_folder? filename, folder).to be_false
+        end
+      end
+    end
+  end
+
   after :all do
     Dir.chdir '..'
     FileUtils.rm_r 'TEST'

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|
-  c.filter_run focus: true
+  # c.filter_run focus: true
 end
 
 FIXTURE_PATH = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))

data/voog-kit.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'guard-rspec'
   
   spec.add_runtime_dependency 'gli', '2.10.0'
   spec.add_runtime_dependency 'pry', '~> 0.9.12'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: '0.3'
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +205,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.markdown
 - Rakefile