shopify_theme 0.0.4 → 0.0.5

data/lib/shopify_theme.rb

@@ -1,35 +1,52 @@
 require 'httparty'
 module ShopifyTheme
-  class ShopifyParty
-    include HTTParty
-
-    def self.asset_list
-      response = shopify.get("/admin/assets.json")
-      assets = JSON.parse(response.body)["assets"].collect {|a| a['key'] }
-      # Remove any .css files if a .css.liquid file exists
-      assets.reject{|a| assets.include?("#{a}.liquid") }
-    end
+  include HTTParty
 
-    def self.get_asset(asset)
-      response = shopify.get("/admin/assets.json", :query =>{:asset => {:key => asset}})
-      # HTTParty json parsing is broken?
-      JSON.parse(response.body)["asset"]
-    end
+  NOOPParser = Proc.new {|data, format| {} }
 
-    def self.send_asset(data)
-      shopify.put("/admin/assets.json", :body =>{:asset => data})
-    end
+  def self.asset_list
+    # HTTParty parser chokes on assest listing, have it noop
+    # and then use a rel JSON parser.
+    response = shopify.get("/admin/assets.json", :parser => NOOPParser)
+    assets = JSON.parse(response.body)["assets"].collect {|a| a['key'] }
+    # Remove any .css files if a .css.liquid file exists
+    assets.reject{|a| assets.include?("#{a}.liquid") }
+  end
 
-    def self.delete_asset(asset)
-      shopify.delete("/admin/assets.json", :body =>{:asset => {:key => asset}})
-    end
+  def self.get_asset(asset)
+    response = shopify.get("/admin/assets.json", :query =>{:asset => {:key => asset}}, :parser => NOOPParser)
+    # HTTParty json parsing is broken?
+    JSON.parse(response.body)["asset"]
+  end
+
+  def self.send_asset(data)
+    shopify.put("/admin/assets.json", :body =>{:asset => data})
+  end
 
-    private
-    def self.shopify
-      @config = YAML.load(File.read('config.yml'))
-      basic_auth @config[:api_key], @config[:password]
-      base_uri "http://#{@config[:store]}"
-      ShopifyParty
+  def self.delete_asset(asset)
+    shopify.delete("/admin/assets.json", :body =>{:asset => {:key => asset}})
+  end
+
+  def self.config
+    @config ||= YAML.load(File.read('config.yml'))
+  end
+
+  def self.ignore_files
+    @ignore_files ||= (config[:ignore_files] || []).compact.collect { |r| Regexp.new(r) }
+  end
+
+  def self.is_binary_data?(string)
+    if string.respond_to?(:encoding)
+      string.encoding == "US-ASCII"
+    else
+      ( string.count( "^ -~", "^\r\n" ).fdiv(string.size) > 0.3 || string.index( "\x00" ) ) unless string.empty?
     end
   end
+
+  private
+  def self.shopify
+    basic_auth config[:api_key], config[:password]
+    base_uri "http://#{config[:store]}"
+    ShopifyTheme
+  end
 end

data/lib/shopify_theme/cli.rb

@@ -19,14 +19,14 @@ module ShopifyTheme
 
     desc "configure API_KEY PASSWORD STORE", "generate a config file for the store to connect to"
     def configure(api_key=nil, password=nil, store=nil)
-      config = {:api_key => api_key, :password => password, :store => store}
+      config = {:api_key => api_key, :password => password, :store => store, :ignore_files => ["README"]}
       create_file('config.yml', config.to_yaml)
     end
 
     desc "download FILE", "download the shops current theme assets"
     method_option :quiet, :type => :boolean, :default => false
     def download(*keys)
-      assets = keys.empty? ? ShopifyParty.asset_list : keys
+      assets = keys.empty? ? ShopifyTheme.asset_list : keys
 
       assets.each do |asset|
         download_asset(asset)
@@ -44,13 +44,13 @@ module ShopifyTheme
       end
       say("Done.", :green) unless options['quiet']
     end
-    
+
     desc "replace FILE", "completely replace shop theme assets with local theme assets"
     method_option :quiet, :type => :boolean, :default => false
     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? ? ShopifyParty.asset_list : keys
+		    remote_assets = keys.empty? ? ShopifyTheme.asset_list : keys
 	      remote_assets.each do |asset|
 	        delete_asset(asset, options['quiet'])
 	      end
@@ -84,7 +84,7 @@ module ShopifyTheme
         end
         if !options['keep_files']
 	        m.delete do |base, relative|
-						delete_asset(relative, options['quiet'])					
+						delete_asset(relative, options['quiet']) if local_assets_list.include?(relative)
 		      end
 	      end
       end
@@ -93,11 +93,15 @@ module ShopifyTheme
     private
 
     def local_assets_list
-      Dir.glob(File.join("**", "*")).reject{ |p| File.directory?(p) || IGNORE.include?(p)}
+      Dir.glob(File.join("**", "*")).reject do |p|
+        File.directory?(p) || IGNORE.include?(p) || ShopifyTheme.ignore_files.any? do |i|
+          i =~ p
+        end
+      end
     end
 
     def download_asset(key)
-      asset = ShopifyParty.get_asset(key)
+      asset = ShopifyTheme.get_asset(key)
       if asset['value']
         # For CRLF line endings
         content = asset['value'].gsub("\r", "")
@@ -111,25 +115,30 @@ module ShopifyTheme
 
     def send_asset(asset, quiet=false)
       data = {:key => asset}
-      if (content = File.read(asset)).is_binary_data? || BINARY_EXTENSIONS.include?(File.extname(asset).gsub('.',''))
+      content = File.read(asset)
+      if ShopifyTheme.is_binary_data?(content) || BINARY_EXTENSIONS.include?(File.extname(asset).gsub('.',''))
         data.merge!(:attachment => Base64.encode64(content))
       else
         data.merge!(:value => content)
       end
 
-      if ShopifyParty.send_asset(data).success?
+      if (response = ShopifyTheme.send_asset(data)).success?
         say("Uploaded: #{asset}", :green) unless quiet
       else
-        say("Error: Could not upload #{asset}", :red)
+        say("Error: Could not upload #{asset}. #{errors_from_response(response)}", :red)
       end
     end
-    
+
     def delete_asset(key, quiet=false)
-			if ShopifyParty.delete_asset(key).success?
+      if (response = ShopifyTheme.delete_asset(key)).success?
         say("Removed: #{key}", :green) unless quiet
       else
-        say("Error: Could not remove #{key}", :red)
+        say("Error: Could not remove #{key}. #{errors_from_response(response)}", :red)
       end
-    end    
+    end
+
+    def errors_from_response(response)
+      response.parsed_response ? response.parsed_response["errors"].values.join(", ") : ""
+    end
   end
 end

data/lib/shopify_theme/version.rb

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

metadata

@@ -1,93 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shopify_theme
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - John Duff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-19 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2162609340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 14
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.14.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2162609340
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &2162608820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.7.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2162608820
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2162608420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fssm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2162608420
+- !ruby/object:Gem::Dependency
+  name: fssm
+  requirement: &2162607940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-description: 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.
-email: 
+  prerelease: false
+  version_requirements: *2162607940
+description: 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.
+email:
 - john.duff@shopify.com
-executables: 
+executables:
 - theme
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -98,39 +75,28 @@ files:
 - lib/shopify_theme/cli.rb
 - lib/shopify_theme/version.rb
 - shopify_theme.gemspec
-has_rdoc: true
 homepage: https://github.com/Shopify/shopify_theme
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shopify_theme
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Command line tool for developing themes
 test_files: []
-