voog-kit 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d51265487abe684ab985aa2a022320f1d90fd4c
-  data.tar.gz: dcb97fd3850d54369acca83bb9371726739daf94
+  metadata.gz: 5c7ac235dd563c5bfebdf3a3c1153c9898da4810
+  data.tar.gz: e3d3d75ae208a8af22c2198fb8882656dc4b6051
 SHA512:
-  metadata.gz: 60c1fe21341912b8fbca1a2fa9a35af9a1448fd92212c7aff0f10634ed5a8cf47c98c6c86732425b907418b0c458703072dff960e36f99fe82fa286a0ae417d4
-  data.tar.gz: 045fad4b96ef25ade5b87bd3cd1c39cca8b761a64b91970b58f8afc0cbdac4ef1d7edc2957b468d36971c64387376189c979cc43f6a5f0c17c2aab674c2c2e33
+  metadata.gz: 9787c777adc1df1fd0d42f396677195af1a2c8766a780735f8a13f7428cea44abc0635fc78d882cb8495fc934700b413123897a8ad058dd1332992fbe68f7a5b
+  data.tar.gz: 04e62394e467681c2013a9683f919ee2fc93e560360bff2a3b579c7105c22f99d194ddf0e214c51111b920415ef2986832f7232326e8c2817ca24bbbfea1deaa

data/bin/kit

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'guard'
 require 'gli'
 
 $LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
 require 'json'
 
 require 'voog/dtk'
-require 'voog/dtk/guard'
+require 'voog/dtk/watcher'
 require 'voog/dtk/filemanager'
 require 'voog/dtk/notifier'
 require 'voog_api'
@@ -234,8 +233,10 @@ command :watch do |c|
   c.flag *api_token_args
   c.flag *site_args
   c.action do |global_options, options, args|
-    Voog::Dtk::Guuard.new(@filemanager, @debug).run
-    sleep 0.1 while ::Guard.running
+    @notifier.info "Watching #{Dir.pwd}/ for changes..."
+    @notifier.newline
+    watcher = Voog::Dtk::Watcher.new(@filemanager, @debug)
+    watcher.run
   end
 end
 

data/lib/voog/dtk/filemanager.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'fileutils'
 require 'git'
 require 'mime/types'
+require 'pathname'
 
 module Voog::Dtk
   class FileManager
@@ -11,6 +12,14 @@ module Voog::Dtk
 
     BOILERPLATE_URL = 'git@github.com:Edicy/design-boilerplate.git'
 
+    ASSET_FOLDER_MAP = {
+        'image' => 'images',
+        'stylesheet' => 'stylesheets',
+        'javascript' => 'javascripts',
+        'font' => 'assets',
+        'unknown' => 'assets'
+      }
+
     def initialize(client, opts = {})
       @client = client
       @silent = opts.fetch(:silent, false)
@@ -68,6 +77,18 @@ module Voog::Dtk
       end
     end
 
+    def relative_path_of(file)
+      if file.include? Dir.pwd
+        pwd = Pathname.new Dir.pwd
+        file_path = Pathname.new file
+        file_path.relative_path_from(pwd).to_s
+      else
+        file
+      end
+    rescue
+      file
+    end
+
     def add_to_manifest(files = nil)
       return if files.nil?
       @manifest = read_manifest
@@ -134,7 +155,7 @@ module Voog::Dtk
     def remove_from_manifest(files = nil)
       return if files.nil?
       @manifest = read_manifest
-      files = (files.is_a? String) ? [files] : files
+      files = (files.is_a? String) ? [relative_path_of(files)] : files.map{ |f| relative_path_of(f) }
       files.uniq.each do |file|
         match = /^(component|layout|image|javascript|asset|stylesheet)s\/(.*)/.match(file)
         next if match.nil?
@@ -434,16 +455,8 @@ module Voog::Dtk
         && asset.respond_to?(:asset_type) \
         && (asset.respond_to?(:public_url) || asset.respond_to?(:data))
 
-      folder_names = {
-        'image' => 'images',
-        'stylesheet' => 'stylesheets',
-        'javascript' => 'javascripts',
-        'font' => 'assets',
-        'unknown' => 'assets'
-      }
-
       if valid
-        folder = folder_names.fetch(asset.asset_type, 'assets')
+        folder = ASSET_FOLDER_MAP.fetch(asset.asset_type, 'assets')
 
         Dir.mkdir(folder) unless Dir.exist?(folder)
         Dir.chdir(folder)
@@ -652,7 +665,8 @@ module Voog::Dtk
     def layout_asset_id_map(assets=nil)
       assets ||= get_layout_assets
       assets.inject(Hash.new) do |memo, a|
-        memo[a.public_url.gsub("http://#{@client.host}/", '')] = a.id
+        filename = "#{ASSET_FOLDER_MAP.fetch(a.asset_type, 'assets')}/#{a.filename}"
+        memo[filename] = a.id
         memo
       end
     end
@@ -669,9 +683,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.exist? file
-          subfiles = Dir.new(file).entries.reject{|e| e =~ /^(\.|\.\.)$/ } # Keep only normal subfiles
-          subfiles.map! { |subfile| subfile = "#{file[/[^\/]*/]}/#{subfile}" } # Prepend folder name
+        if Dir.exist? relative_path_of(file)
+          subfiles = Dir.new(relative_path_of(file)).entries.reject{|e| e =~ /^(\.|\.\.)$/ } # Keep only normal subfiles
+          subfiles.map! { |subfile| subfile = "#{relative_path_of(file)[/[^\/]*/]}/#{subfile}" } # Prepend folder name
           files[index] = subfiles # Insert as Array so sub-subfolders won't get processed again
         end
       end
@@ -683,88 +697,89 @@ module Voog::Dtk
 
       files.each_with_index do |file, index|
         @notifier.newline if index > 0
-        if File.exist?(file)
-          if uploadable?(file)
-            if file =~ /^(layout|component)s\/[^\s\/]+\.tpl$/ # if layout/component
-              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'))
+        relative_filename = relative_path_of(file)
+        if File.exist?(relative_filename)
+          if uploadable?(relative_filename)
+            if relative_filename =~ /^(layout|component)s\/[^\/]+\.tpl$/ # if layout/component
+              if local_layouts.include?(relative_filename)
+                if layouts.key?(relative_filename)
+                  @notifier.info "Updating layout file #{relative_filename}..."
+                  if update_layout(layouts[relative_filename], File.read(relative_filename, encoding: 'UTF-8'))
                     @notifier.success 'OK!'
                   else
-                    @notifier.error "Cannot update layout file #{file}!"
+                    @notifier.error "Cannot update layout file #{relative_filename}!"
                   end
                 else
-                  @notifier.warning "Remote file #{file} not found!"
-                  @notifier.info "\nTrying to create layout file #{file}..."
-                  if create_remote_layout(file)
+                  @notifier.warning "Remote file #{relative_filename} not found!"
+                  @notifier.info "\nTrying to create layout file #{relative_filename}..."
+                  if create_remote_layout(relative_filename)
                     @notifier.success 'OK!'
                   else
-                    @notifier.error "Unable to create layout file #{file}!"
+                    @notifier.error "Unable to create layout file #{relative_filename}!"
                   end
                 end
               else
-                @notifier.warning "Layout file #{file} not found in manifest! Skipping."
+                @notifier.warning "Layout file #{relative_filename} not found in manifest! Skipping."
               end
-            elsif file =~ /^(asset|image|stylesheet|javascript)s\/[^\s\/]+\..+$/ # if other asset
-              if local_assets.include? file
-                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'))
+            elsif relative_filename =~ /^(asset|image|stylesheet|javascript)s\/[^\/]+\..+$/ # if other asset
+              if local_assets.include? relative_filename
+                if layout_assets.key? relative_filename
+                  if is_editable?(relative_filename)
+                    @notifier.info "Updating layout asset file #{relative_filename}..."
+                    if update_layout_asset(layout_assets[relative_filename], File.read(relative_filename, encoding: 'UTF-8'))
                       @notifier.success 'OK!'
                     else
-                      @notifier.error "Unable to update file #{file}!"
+                      @notifier.error "Unable to update file #{relative_filename}!"
                     end
                   else
                     if @overwrite
-                      @notifier.info "Re-uploading file #{file}..."
-                      if delete_layout_asset(layout_assets[file]) && create_remote_file(file)
+                      @notifier.info "Re-uploading file #{relative_filename}..."
+                      if delete_layout_asset(layout_assets[relative_filename]) && create_remote_file(relative_filename)
                         @notifier.success 'OK!'
                       else
-                        @notifier.error "Unable to update file #{file}!"
+                        @notifier.error "Unable to update file #{relative_filename}!"
                       end
                     else
-                      @notifier.warning "Not allowed to update file #{file}!"
+                      @notifier.warning "Not allowed to update file #{relative_filename}!"
                     end
                   end
                 else
-                  @notifier.warning "Remote file #{file} not found!"
-                  @notifier.info "\nTrying to create file #{file}..."
-                  if create_remote_file(file)
+                  @notifier.warning "Remote file #{relative_filename} not found!"
+                  @notifier.info "\nTrying to create file #{relative_filename}..."
+                  if create_remote_file(relative_filename)
                     @notifier.success 'OK!'
                   else
-                    @notifier.error "Unable to create file #{file}!"
+                    @notifier.error "Unable to create file #{relative_filename}!"
                   end
                 end
               else
-                @notifier.warning "Asset file #{file} not found in manifest! Skipping."
+                @notifier.warning "Asset file #{relative_filename} not found in manifest! Skipping."
               end
-            elsif Dir.exist? file
-              @notifier.warning "Not allowed to push subfolder #{file}!"
+            elsif Dir.exist? relative_filename
+              @notifier.warning "Not allowed to push subfolder #{relative_filename}!"
             else
-              @notifier.warning "Not allowed to push file #{file}!"
+              @notifier.warning "Not allowed to push file #{relative_filename}!"
             end
           else
-            @notifier.error "Cannot upload file #{file}!"
+            @notifier.error "Cannot upload file #{relative_filename}!"
           end
         else
-          @notifier.error "File #{file} not found!"
+          @notifier.error "File #{relative_filename} not found!"
         end
       end
       @notifier.newline
     end
 
     def is_editable?(file)
-      folder = file.split('/').first
-      extension = file.split('/').last.split('.').last
+      folder = relative_path_of(file).split('/').first
+      extension = relative_path_of(file).split('/').last.split('.').last
 
       (%w(stylesheets javascripts).include? folder) && (%w(js css).include? extension)
     end
 
     def content_type_for(file)
-      folder = file.split('/').first
-      if is_editable?(file)
+      folder = relative_path_of(file).split('/').first
+      if is_editable?(relative_path_of(file))
         if folder == 'stylesheets'
           'text/css'
         elsif folder == 'javascripts'
@@ -772,7 +787,7 @@ module Voog::Dtk
         end
       else
         if folder == 'images'
-          "image/#{file.split('/').last.split('.').last}"
+          "image/#{relative_path_of(file).split('/').last.split('.').last}"
         elsif folder == 'assets'
           'unknown/unknown'
         end
@@ -841,7 +856,7 @@ module Voog::Dtk
     end
 
     def add_files(names)
-      new_files = add_to_manifest names
+      new_files = add_to_manifest names.map {|n| relative_path_of(n)}
       upload_files new_files.map { |f| f.fetch('file') } unless new_files.empty?
     end
 
@@ -858,14 +873,15 @@ module Voog::Dtk
     end
 
     def remove_remote_file(file)
-      folder, filename = file.split('/')
+      relative_filename = relative_path_of(file)
+      folder, filename = relative_filename.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)
+      if is_asset? relative_filename
+        id = asset_ids.fetch(relative_filename, nil)
 
         unless id.nil?
           if delete_layout_asset(id)
@@ -874,31 +890,31 @@ module Voog::Dtk
             @notifier.error "Failed to remove remote asset '#{filename}'!" unless @silent
           end
         end
-      elsif is_layout? file
+      elsif is_layout? relative_filename
         filename = filename.gsub('.tpl', '')
-        id = layout_ids.fetch(file, nil)
+        id = layout_ids.fetch(relative_filename, 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
+            @notifier.error "Failed to remove remote layout '#{relative_filename}'!" unless @silent
           end
         end
       else
-        @notifier.error "Invalid filename: '#{file}'"
+        @notifier.error "Invalid filename: '#{relative_filename}'"
       end
       @notifier.newline
     end
 
     def uploadable?(file)
       if file.is_a? String
-        !(file =~ /^(component|layout|image|asset|javascript|stylesheet)s\/([^\s]+)/).nil?
+        !(relative_path_of(file) =~ /(component|layout|image|asset|javascript|stylesheet)s\/(.+)/).nil?
       else
         begin
-          uploadable? file.try(:to_s)
+          uploadable? (relative_path_of(file).is_a? String) ? relative_path_of(file).try(:to_s) : relative_path_of(file)
         rescue
-          raise "Cannot upload file '#{file}'!".red
+          raise "Cannot upload file '#{relative_path_of(file)}'!".red
         end
       end
     end

data/lib/voog/dtk/version.rb

@@ -1,5 +1,5 @@
 module Voog
   module Dtk
-    VERSION = '0.3.9'
+    VERSION = '0.4.0'
   end
 end

data/lib/voog/dtk/watcher.rb

@@ -0,0 +1,75 @@
+require 'listen'
+# module Guard
+#   class VoogKit < Plugin
+#     attr_accessor :options, :filemanager, :debug
+
+#     def initialize(options = {})
+#       @options = options
+#       super(options)
+#     end
+
+#     def run_on_additions(paths)
+#       @filemanager.add_files paths
+#     rescue => e
+#       @filemanager.notifier.newline
+#       Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
+#     end
+
+#     def run_on_removals(paths)
+#       @filemanager.remove_files paths
+#     rescue => e
+#       @filemanager.notifier.newline
+#       Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
+#     end
+
+#     def run_on_modifications(paths)
+#       @filemanager.upload_files paths
+#       @filemanager.notifier.newline
+#     rescue => e
+#       @filemanager.notifier.newline
+#       Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
+#     end
+#   end
+# end
+
+module Voog::Dtk
+  class Watcher
+    def initialize(filemanager, debug=false)
+      paths = ['layouts/', 'components/', 'assets/', 'javascripts/', 'stylesheets/', 'images/']
+
+      @filemanager = filemanager
+      @debug = debug
+      @listener = Listen.to(*paths) do |modified, added, removed|
+        handle_added added unless added.empty?
+        handle_removed removed unless removed.empty?
+        handle_modified modified unless modified.empty?
+      end
+    end
+
+    def handle_added(added)
+      @filemanager.add_files added
+    rescue => e
+      @filemanager.notifier.newline
+      Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
+    end
+
+    def handle_removed(removed)
+      @filemanager.remove_files removed
+    rescue => e
+      @filemanager.notifier.newline
+      Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
+    end
+
+    def handle_modified(modified)
+      @filemanager.upload_files modified
+    rescue => e
+      @filemanager.notifier.newline
+      Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
+    end
+
+    def run
+      @listener.start
+      sleep
+    end
+  end
+end

data/spec/models/dtk/filemanager_spec.rb

@@ -194,8 +194,8 @@ describe Voog::Dtk::FileManager do
       end
     end
 
-    context 'with existing data' do
-      it 'doesn\'t add a duplicate file' do
+    context 'with existing data'do
+      it 'doesn\'t add a duplicate file', focus: true  do
         testfiles = ['components/test_layout.tpl', 'layouts/testfile.tpl']
         @filemanager.add_to_manifest testfiles
         @manifest = @filemanager.read_manifest

data/voog-kit.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rspec'
   
   spec.add_runtime_dependency 'gli', '2.10.0'
-  spec.add_runtime_dependency 'pry', '>= 0.9.12'
-  spec.add_runtime_dependency 'guard', '>= 2.3.0', '< 3.0'
+  spec.add_runtime_dependency 'pry'
+  spec.add_runtime_dependency 'listen', '~> 3.0'
   spec.add_runtime_dependency 'git'
   spec.add_runtime_dependency 'parseconfig'
   spec.add_runtime_dependency 'voog_api', '~> 0.0.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,32 +87,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -224,9 +218,9 @@ files:
 - bin/kit
 - lib/voog/dtk.rb
 - lib/voog/dtk/filemanager.rb
-- lib/voog/dtk/guard.rb
 - lib/voog/dtk/notifier.rb
 - lib/voog/dtk/version.rb
+- lib/voog/dtk/watcher.rb
 - spec/fixtures/.DS_Store
 - spec/fixtures/.voog
 - spec/fixtures/.voog2

data/lib/voog/dtk/guard.rb

@@ -1,152 +0,0 @@
-require 'guard'
-require 'guard/guard'
-require 'guard/plugin'
-
-module Guard
-  class Shell < Guard
-    VERSION = '0.5.2'
-
-    # Calls #run_all if the :all_on_start option is present.
-    def start
-      run_all if options[:all_on_start]
-    end
-
-    # Call #run_on_change for all files which match this guard.
-    def run_all
-      run_on_modifications(Watcher.match_files(self, Dir.glob('{,**/}*{,.*}').uniq))
-    end
-
-    # Print the result of the command(s), if there are results to be printed.
-    def run_on_modifications(res)
-      puts res if res
-    end
-  end
-end
-
-module Voog::Dtk
-  class ::Guard::Watchman < ::Guard::Plugin
-    attr_accessor :options, :filemanager, :debug
-
-    # Initializes a Guard plugin.
-    # Don't do any work here, especially as Guard plugins get initialized even if they are not in an active group!
-    #
-    # @param [Hash] options the custom Guard plugin options
-    # @option options [Array<Guard::Watcher>] watchers the Guard plugin file watchers
-    # @option options [Symbol] group the group this Guard plugin belongs to
-    # @option options [Boolean] any_return allow any object to be returned from a watcher
-    #
-    def initialize(options = {})
-      super
-      @options = options
-    end
-
-    # Called once when Guard starts. Please override initialize method to init stuff.
-    #
-    # @raise [:task_has_failed] when start has failed
-    # @return [Object] the task result
-    #
-    def start
-      ::Guard::UI.info 'Guard::Voog is running'
-      # run_all
-    end
-
-    def debug=(debug)
-      ::Guard::UI.info 'Debug mode is enabed' if debug
-      @debug = debug
-    end
-
-    # Called when `stop|quit|exit|s|q|e + enter` is pressed (when Guard quits).
-    #
-    # @raise [:task_has_failed] when stop has failed
-    # @return [Object] the task result
-    #
-    def stop
-      ::Guard::UI.info 'Guard::Voog stopped'
-    end
-
-    # Called when `reload|r|z + enter` is pressed.
-    # This method should be mainly used for "reload" (really!) actions like reloading passenger/spork/bundler/...
-    #
-    # @raise [:task_has_failed] when reload has failed
-    # @return [Object] the task result
-    #
-    # def reload
-    # end
-
-    # Called when just `enter` is pressed
-    # This method should be principally used for long action like running all specs/tests/...
-    #
-    # @raise [:task_has_failed] when run_all has failed
-    # @return [Object] the task result
-    #
-    # def run_all
-    # end
-
-    # Default behaviour on file(s) changes that the Guard plugin watches.
-    # @param [Array<String>] paths the changes files or paths
-    # @raise [:task_has_failed] when run_on_change has failed
-    # @return [Object] the task result
-    #
-    # def run_on_changes(paths)
-    # end
-
-    # Called on file(s) additions that the Guard plugin watches.
-    #
-    # @param [Array<String>] paths the changes files or paths
-    # @raise [:task_has_failed] when run_on_additions has failed
-    # @return [Object] the task result
-    #
-    def run_on_additions(paths)
-      @filemanager.add_files paths
-    rescue => e
-      @filemanager.notifier.newline
-      Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
-    end
-
-    # Called on file(s) removals that the Guard plugin watches.
-    #
-    # @param [Array<String>] paths the changes files or paths
-    # @raise [:task_has_failed] when run_on_removals has failed
-    # @return [Object] the task result
-    #
-    def run_on_removals(paths)
-      @filemanager.remove_files paths
-    rescue => e
-      @filemanager.notifier.newline
-      Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
-    end
-
-    # Called on file(s) modifications that the Guard plugin watches.
-    #
-    # @param [Array<String>] paths the changes files or paths
-    # @raise [:task_has_failed] when run_on_modifications has failed
-    # @return [Object] the task result
-    #
-    def run_on_modifications(paths)
-      @filemanager.upload_files paths
-      @filemanager.notifier.newline
-    rescue => e
-      @filemanager.notifier.newline
-      Voog::Dtk.handle_exception e, @debug, @filemanager.notifier
-    end
-  end
-
-  class Guuard
-    def initialize(filemanager, debug=false)
-      @filemanager = filemanager
-      @debug = debug
-    end
-
-    def run
-      guardfile = <<-EOF
-        guard 'watchman' do
-          watch(%r{^(layout|component|image|asset|javascript|stylesheet)s/.*})
-        end
-      EOF
-
-      ::Guard.start(guardfile_contents: guardfile)
-      ::Guard.guards('watchman').first.filemanager = @filemanager
-      ::Guard.guards('watchman').first.debug = @debug
-    end
-  end
-end