quickdraw 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58a82ffc2216e932bdba3e67e015de64707d4fc1
-  data.tar.gz: e1c97b28041a34d4d76e908280210a84014a15fa
+  metadata.gz: 51f90e243e29a4b80d81e1d21012cae4fa8e02dc
+  data.tar.gz: 970effdf3f87cfe12b67618bac1b9d5dd02fcc03
 SHA512:
-  metadata.gz: a1e342512ec19ddaad5a6294fcb640e958d0f70680c14c99aed6b4e75abb5e60d0b97207be5a931d8745b376038ffbaf518701ca89b7e362360c27121e637494
-  data.tar.gz: 385cdb7184de9c48211987d8476e8bc89a358517fd3859cdef9fd79869532c6bfbe281e22580ce19b9826268eebcda5c9c1bbfe9ca085e2cf741f02f2d39d2b5
+  metadata.gz: 9fc8e5530408ad1cc5d7bde5933b64309d26afb6b9c8097574f33a206d7a3a6a10db8da3dbe6f5acff293095e0b6bfcecd533c9be6eab4f4a4b29181ffb1d6bd
+  data.tar.gz: 410c09bb7122a33a7ee99be3146bafac7b561143a03b0b26d2663e6172a3b2d7107231e33f2415439caaa31fe0709dd27c534ba1098e3996e9d7fbde031581bf

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0
+ruby-2.1

data/README.md

@@ -4,6 +4,7 @@ The idea for Quickdraw comes from the 'shopify_theme' gem. I use a lot of code f
 
 ### Features
 
+- Compatible with Ruby 2.0 and 2.1
 - MUCH faster downloads and uploads. Unfortunately, Shopify API call limits will slow you down. But in short bursts (10-20 files), Quickdraw is as much as 10x faster or more!
 - Quickdraw supports using ERB templates which are compiled then uploaded to shopify. This can save you time when making templates with redundant code.
 
@@ -28,6 +29,18 @@ Or install it yourself as:
 3. run ````quickdraw download````
 4. run ````quickdraw watch````
 
+### Workflow
+
+Quickdraw creates two folders in your project, ````theme```` and ````src````.
+When ````quickdraw watch```` is running, files added/changed/deleted in the ````theme```` folder will be mirrored to Shopify automatically.
+To use ERB create a copy of the ````.liquid```` file you want to use, add an ````.erb```` extension to the end, and move it to the ````src```` folder.
+
+#####Example
+    project/theme/templates/index.liquid
+    project/src/templates/index.liquid.erb
+
+When the ````project/src/templates/index.liquid.erb```` is modified, Quickdraw will render it, overwriting ````project/theme/templates/index.liquid````, and uploading the result to Shopify.
+
 ## Contributing
 
 1. Fork it

data/lib/quickdraw/cli.rb

@@ -1,11 +1,11 @@
 require 'thor'
-#require 'yaml'
+require 'yaml'
 #YAML::ENGINE.yamler = 'syck' if defined? Syck
 #require 'abbrev'
 #require 'base64'
 #require 'fileutils'
 #require 'json'
-require 'listen'
+require 'filewatcher'
 #require 'launchy'
 require 'benchmark'
 require 'pathname'
@@ -30,7 +30,17 @@ module Quickdraw
 			}
 			create_file('config.yml', config.to_yaml)
 			empty_directory('src')
+			empty_directory('src/assets')
+			empty_directory('src/config')
+			empty_directory('src/layout')
+			empty_directory('src/snippets')
+			empty_directory('src/templates')
 			empty_directory('theme')
+			empty_directory('theme/assets')
+			empty_directory('theme/config')
+			empty_directory('theme/layout')
+			empty_directory('theme/snippets')
+			empty_directory('theme/templates')
 		end
 
 		desc "upload FILES", "upload all theme assets to shop"
@@ -161,34 +171,32 @@ module Quickdraw
 
 			futures = []
 
-			listener = Listen.to((Quickdraw.getwd/'theme').to_s, (Quickdraw.getwd/'src').to_s, :force_polling => true, :latency => 0.2 ) do |modified, added, removed|
-				modified.each do |asset|
-					asset = asset.as_path
-					say("MODIFIED: #{asset.relative_to(Quickdraw.getwd)}", :green)
+			FileWatcher.new([(Quickdraw.getwd/'theme').to_s, (Quickdraw.getwd/'src').to_s]).watch(0.5) do |asset, event|
+				asset = asset.as_path
+				if(event == :changed)
 					if theme_file?(asset)
+						say("UPLOADING: #{asset.relative_to(Quickdraw.getwd)}", :green)
 						futures << Celluloid::Actor[:shopify_connector].future.upload_asset(asset)
 					elsif src_file?(asset)
+						say("COMPILING: #{asset.relative_to(Quickdraw.getwd)}", :green)
 						futures << Celluloid::Actor[:shopify_connector].future.compile_asset(asset)
 					end
 				end
-				added.each do |asset|
-					asset = asset.as_path
-					say("ADDED: #{asset}", :green)
+				if(event == :delete)
 					if theme_file?(asset)
-						futures << Celluloid::Actor[:shopify_connector].future.upload_asset(asset)
+						say("REMOVING: #{asset}", :green)
+						futures << Celluloid::Actor[:shopify_connector].future.remove_asset(asset)
 					else
 					end
 				end
-				removed.each do |asset|
-					asset = asset.as_path
-					say("REMOVED: #{asset}", :green)
+				if(event == :new)
 					if theme_file?(asset)
-						futures << Celluloid::Actor[:shopify_connector].future.remove_asset(asset)
+						say("ADDING: #{asset}", :green)
+						futures << Celluloid::Actor[:shopify_connector].future.upload_asset(asset)
 					else
 					end
 				end
 			end
-			listener.start
 
 			loop do
 
@@ -207,7 +215,10 @@ module Quickdraw
 				sleep 0.2
 			end
 
-		rescue
+		rescue => e
+			puts e.message
+			puts e.backtrace
+			retry
 			puts "exiting...."
 		end
 

data/lib/quickdraw/version.rb

@@ -1,3 +1,3 @@
 module Quickdraw
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/quickdraw.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["bryan@internalfx.com"]
   spec.description   = %q{Quickly develop Shopify themes}
   spec.summary       = %q{Allows the use of ERB templates to develop and "compile" a theme and then automatically deploy to Shopify}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/internalfx/quickdraw"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10"
 
-  spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "listen"
-  spec.add_runtime_dependency "celluloid"
-  spec.add_runtime_dependency "httparty"
-  spec.add_runtime_dependency "filepath"
+  spec.add_runtime_dependency "thor", "~> 0.18"
+  spec.add_runtime_dependency "filewatcher", "~> 0.3"
+  spec.add_runtime_dependency "celluloid", "~> 0.15"
+  spec.add_runtime_dependency "httparty", "~> 0.12"
+  spec.add_runtime_dependency "filepath", "~> 0.6"
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: quickdraw
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Bryan Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: filepath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 description: Quickly develop Shopify themes
 email:
 - bryan@internalfx.com
@@ -116,8 +116,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,7 +129,7 @@ files:
 - lib/quickdraw/shopify_connector_pool.rb
 - lib/quickdraw/version.rb
 - quickdraw.gemspec
-homepage: ''
+homepage: https://github.com/internalfx/quickdraw
 licenses:
 - MIT
 metadata: {}
@@ -139,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Allows the use of ERB templates to develop and "compile" a theme and then