shopify_theme 0.0.8 → 0.0.9

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.project

data/README.md

@@ -45,3 +45,9 @@ Watch the theme directory and upload any files as they change
 ````
 theme watch
 ````
+
+Open the store in the default browser
+
+````
+theme open
+````

data/lib/shopify_theme/cli.rb

@@ -1,18 +1,20 @@
 require 'thor'
 require 'yaml'
-YAML::ENGINE.yamler = 'syck'
+YAML::ENGINE.yamler = 'syck' if defined? Syck
 require 'abbrev'
 require 'base64'
 require 'fileutils'
 require 'json'
 require 'listen'
+require 'launchy'
 
 module ShopifyTheme
   class Cli < Thor
     include Thor::Actions
 
-    BINARY_EXTENSIONS = %w(png gif jpg jpeg eot svg ttf woff swf)
+    BINARY_EXTENSIONS = %w(png gif jpg jpeg eot svg ttf woff swf ico)
     IGNORE = %w(config.yml)
+    TIMEFORMAT = "%H:%M:%S"
 
     tasks.keys.abbrev.each do |shortcut, command|
       map shortcut => command.to_sym
@@ -36,6 +38,15 @@ module ShopifyTheme
       say("Done.", :green) unless options['quiet']
     end
 
+    desc "open", "open the store in your browser"
+    def open(*keys)
+      config = YAML.load_file 'config.yml'
+      url = config[:store]
+      if Launchy.open url
+        say("Done.", :green)
+      end
+    end
+
     desc "upload FILE", "upload all theme assets to shop"
     method_option :quiet, :type => :boolean, :default => false
     def upload(*keys)
@@ -51,7 +62,9 @@ module ShopifyTheme
     def replace(*keys)
       say("Are you sure you want to completely replace your shop theme assets? This is not undoable.", :yellow)
       if ask("Continue? (Y/N): ") == "Y"
-        remote_assets = keys.empty? ? ShopifyTheme.asset_list : keys
+        # only delete files on remote that are not present locally
+        # files present on remote and present locally get overridden anyway
+        remote_assets = keys.empty? ? (ShopifyTheme.asset_list - local_assets_list) : keys
         remote_assets.each do |asset|
           delete_asset(asset, options['quiet'])
         end
@@ -76,8 +89,8 @@ module ShopifyTheme
     method_option :quiet, :type => :boolean, :default => false
     method_option :keep_files, :type => :boolean, :default => false
     def watch
-      puts "Watching current folder:"
-      Listen.to('',:relative_paths => true) do |modified, added, removed|
+      puts "Watching current folder: #{Dir.pwd}"
+      Listen.to!(Dir.pwd, :relative_paths => true) do |modified, added, removed|
         modified.each do |filePath|
           send_asset(filePath, options['quiet']) if local_assets_list.include?(filePath)
         end
@@ -90,6 +103,9 @@ module ShopifyTheme
           end
         end
       end
+
+    rescue Interrupt
+      puts "exiting..."
     end
 
     private
@@ -107,40 +123,47 @@ module ShopifyTheme
       if asset['value']
         # For CRLF line endings
         content = asset['value'].gsub("\r", "")
+        format = "w"
       elsif asset['attachment']
         content = Base64.decode64(asset['attachment'])
+        format = "w+b"
       end
 
       FileUtils.mkdir_p(File.dirname(key))
-      File.open(key, "w") {|f| f.write content} if content
+      File.open(key, format) {|f| f.write content} if content
     end
 
     def send_asset(asset, quiet=false)
+      time = Time.now
       data = {:key => asset}
       content = File.read(asset)
       if ShopifyTheme.is_binary_data?(content) || BINARY_EXTENSIONS.include?(File.extname(asset).gsub('.',''))
+        content = IO.read asset
         data.merge!(:attachment => Base64.encode64(content))
       else
         data.merge!(:value => content)
       end
 
       if (response = ShopifyTheme.send_asset(data)).success?
-        say("Uploaded: #{asset}", :green) unless quiet
+        say("[" + time.strftime(TIMEFORMAT) + "] Uploaded: #{asset}", :green) unless quiet
       else
-        say("Error: Could not upload #{asset}. #{errors_from_response(response)}", :red)
+        say("[" + time.strftime(TIMEFORMAT) + "] Error: Could not upload #{asset}. #{errors_from_response(response)}", :red)
       end
     end
 
     def delete_asset(key, quiet=false)
+      time = Time.now
       if (response = ShopifyTheme.delete_asset(key)).success?
-        say("Removed: #{key}", :green) unless quiet
+        say("[" + time.strftime(TIMEFORMAT) + "] Removed: #{key}", :green) unless quiet
       else
-        say("Error: Could not remove #{key}. #{errors_from_response(response)}", :red)
+        say("[" + time.strftime(TIMEFORMAT) + "] Error: Could not remove #{key}. #{errors_from_response(response)}", :red)
       end
     end
 
     def errors_from_response(response)
-      response.parsed_response ? response.parsed_response["errors"].values.join(", ") : ""
+      if response.parsed_response
+        response.parsed_response["errors"] ? response.parsed_response["errors"].values.join(", ") : ""
+      end
     end
   end
 end

data/lib/shopify_theme/version.rb

@@ -1,3 +1,3 @@
 module ShopifyTheme
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/shopify_theme.gemspec

@@ -13,10 +13,12 @@ Gem::Specification.new do |s|
   s.description = %q{Command line tool to help with developing Shopify themes. Provides simple commands to download, upload and delete files from a theme. Also includes the watch command to watch a directory and upload files as they change.}
 
   s.rubyforge_project = "shopify_theme"
+  s.add_development_dependency 'rake'
   s.add_dependency("thor", [">= 0.14.4"])
   s.add_dependency("httparty", [">= 0.8.0"])
   s.add_dependency("json")
-  s.add_dependency("listen")
+  s.add_dependency("listen", [">= 1.0.3"])
+  s.add_dependency("launchy")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -2,15 +2,31 @@
 name: shopify_theme
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - John Duff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  name: rake
+  type: :development
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -64,11 +80,27 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
     none: false
   name: listen
   type: :runtime
   prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  name: launchy
+  type: :runtime
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='