shopify_theme 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b849c05437407aeafa434479b6f2f198a3dc475
-  data.tar.gz: f33e3b4294a93ce747a650c3bc65e67f82bef9d6
+  metadata.gz: 9e1b5d933905a18bf4497561a5c88afe6da8c6bd
+  data.tar.gz: d413dd12ee0d7bc488f9aca40f95c61ba5f3cf1b
 SHA512:
-  metadata.gz: 21aa13d50791237942291edf030d96a624879809e53487b4251c40e1551f5e190b0703b6d2c1f4067e74e89ca94f18bfe876504ae9172e91deba84a2a9c47b95
-  data.tar.gz: 8e3a476aabbfce33e154c1d42014f54a63a285c027d96cedb04caa84bbe29ac0d3ae1a08714ae81d40d459ac531f2212f3778ffa07df1836ac35aead254958a7
+  metadata.gz: 29208b7826fb1895b399d3fd20805c63daa9f0fbd82c65a8aaffa6a46691a3a4ee11898a102c5143b8c4522a436d198398ffd793cc0bdce378dd32682b8e043c
+  data.tar.gz: c323befe94bf7c8e1360603adc8d5ec1a48b66e57bc8a41f595db802870f49eb8316d41d77e1c3b642e8ead4aab983d0acae230f807fb28998b1a5c8488a6849

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.0.19
+* Fixes issue with incorrectly detecting binary assets -- csaunders
+* Properly handle unknown event types -- 
+
 # v0.0.12
 
 * Fixes issue where app tried uploading directories
@@ -5,4 +9,4 @@
 # v0.0.11
 
 * Locks JSON api version which fixed an issue with downloading large binary files -- Tyler Ball
-* Respect API limits when downloading theme assets from Shopify API -- Chris Saunders
+* Respect API limits when downloading theme assets from Shopify API -- Chris Saunders

data/CONTRIBUTING

@@ -0,0 +1,6 @@
+- If the issue doesn't exist, open one to start a discussion
+- If the issue is fine (it probably is) start working on your patch
+- Create a Pull Request
+  - Be sure to update CHANGELOG.md to include the details of your fix
+- Go through code review
+- Get it merged

data/README.md

@@ -1,5 +1,7 @@
 # Edit your Shopify theme locally
 
+[![Gem Version](https://badge.fury.io/rb/shopify_theme.svg)](http://badge.fury.io/rb/shopify_theme)
+
 The Shopify theme gem is a command line tool that lets you make live changes to themes on your Shopify store. If the command line is scary, check out the [Desktop Theme Editor app](http://apps.shopify.com/desktop-theme-editor).
 
 It will watch your local folders for any changes in your theme (including adding and removing files) and will update your .myshopify.com store to the latest changes. 
@@ -107,6 +109,15 @@ theme bootstrap api_key password shop_name theme_name master
 
 # Common Problems
 
+## SSL Certificates won't verify on Windows
+
+If you are experiencing SSL validation errors, it is most likely because your installation does not have any valid
+certificates. This can be taken care of by [downloading a certificate file](http://curl.haxx.se/ca/cacert.pem) and
+[setting a the SSL_CERT_PATH environment variable on your system](http://www.computerhope.com/issues/ch000549.htm).
+For more details check out the following [gist](https://gist.github.com/fnichol/867550).
+
+[See the following issue for more details](https://github.com/Shopify/shopify_theme/issues/103)
+
 ## How do I edit a theme that isn't my shops main theme?
 
 This can be done by setting the `theme_id` field in `config.yml` which was created when you

data/lib/shopify_theme/cli.rb

@@ -7,12 +7,14 @@ require 'fileutils'
 require 'json'
 require 'filewatcher'
 require 'launchy'
+require 'mimemagic'
+
+MimeMagic.add('application/x-liquid', extensions: %w(liquid), parents: 'text/plain')
 
 module ShopifyTheme
   class Cli < Thor
     include Thor::Actions
 
-    BINARY_EXTENSIONS = %w(png gif jpg jpeg eot svg ttf woff otf swf ico)
     IGNORE = %w(config.yml)
     DEFAULT_WHITELIST = %w(layout/ assets/ config/ snippets/ templates/)
     TIMEFORMAT = "%H:%M:%S"
@@ -126,13 +128,16 @@ module ShopifyTheme
       puts "Watching current folder: #{Dir.pwd}"
       watcher do |filename, event|
         filename = filename.gsub("#{Dir.pwd}/", '')
-        action = if local_assets_list.include?(filename) && [:changed, :new].include?(event)
-                   :send_asset
-                 elsif event == :delete
-                   :delete_asset
-                 else
-                   raise NotImplementedError, "Unknown event -- #{event}"
-                 end
+
+        next unless local_assets_list.include?(filename)
+        action = if [:changed, :new].include?(event)
+          :send_asset
+        elsif event == :delete
+          :delete_asset
+        else
+          raise NotImplementedError, "Unknown event -- #{event} -- #{filename}"
+        end
+
         send(action, filename, options['quiet'])
       end
     end
@@ -203,7 +208,7 @@ module ShopifyTheme
       return unless valid?(asset)
       data = {:key => asset}
       content = File.read(asset)
-      if BINARY_EXTENSIONS.include?(File.extname(asset).gsub('.','')) || ShopifyTheme.is_binary_data?(content)
+      if binary_file?(asset) || ShopifyTheme.is_binary_data?(content)
         content = File.open(asset, "rb") { |io| io.read }
         data.merge!(:attachment => Base64.encode64(content))
       else
@@ -244,6 +249,10 @@ module ShopifyTheme
       false
     end
 
+    def binary_file?(path)
+      !MimeMagic.by_path(path).text?
+    end
+
     def report_error(time, message, response)
       say("[#{timestamp(time)}] Error: #{message}", :red)
       say("Error Details: #{errors_from_response(response)}", :yellow)

data/lib/shopify_theme/version.rb

@@ -1,3 +1,3 @@
 module ShopifyTheme
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/shopify_theme.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency('thor', '>= 0.14.4')
   s.add_dependency('httparty', '~> 0.13.0')
   s.add_dependency('json', '~> 1.8.0')
+  s.add_dependency('mimemagic')
   s.add_dependency('filewatcher')
   s.add_dependency('launchy')
 

data/spec/unit/cli_spec.rb

@@ -18,6 +18,11 @@ module ShopifyTheme
         super
       end
 
+      desc "",""
+      def binary_file?(file)
+        super
+      end
+
       desc "", ""
       def local_files
         @local_files
@@ -56,5 +61,17 @@ module ShopifyTheme
       @cli.mock_config = {store: 'somethingfancy.myshopify.com', theme_id: ''}
       assert_equal "somethingfancy.myshopify.com", @cli.shop_theme_url
     end
+
+    it "should report binary files as such" do
+      assert @cli.binary_file?('hello.pdf'), "PDFs are binary files"
+      assert @cli.binary_file?('hello.png'), "PNGs are binary files"
+    end
+
+    it "should not report text based files as binary" do
+      refute @cli.binary_file?('theme.liquid'), "liquid files are not binary"
+      refute @cli.binary_file?('style.sass.liquid'), "sass.liquid files are not binary"
+      refute @cli.binary_file?('style.css'), 'CSS files are not binary'
+      refute @cli.binary_file?('application.js'), 'Javascript files are not binary'
+    end
   end
 end

metadata

@@ -1,161 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: shopify_theme
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - John Duff
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZhZG1p
-  bnMxFzAVBgoJkiaJk/IsZAEZFgdzaG9waWZ5MRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE0MDUxNTIwMzM0OFoXDTE1MDUxNTIwMzM0OFowPzEPMA0GA1UEAwwGYWRt
-  aW5zMRcwFQYKCZImiZPyLGQBGRYHc2hvcGlmeTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0/81O3e1vh5smcwp2G
-  MpLQ6q0kejQLa65bPYPxdzWA1SYOKyGfw+yR9LdFzsuKpwWzKq6zX35lj1IckWS4
-  bNBEQzxmufUxU0XPM02haFB8fOfDJzdXsWte9Ge4IFwahwn68gpMqN+BvxL+KMYz
-  Iut9YmN44d4LZdsENEIO5vmybuG2vYDz7R56qB0PA+Q2P2CdhymsBad2DQs69FBo
-  uico9V6VMYYctL9lCYdzu9IXrOYNTt88suKIVzzAlHOKeN0Ng5qdztFoTR8sfxDr
-  Ydg3KHl5n47wlpgd8R0f/4b5gGxW+v9pyJCgQnLlRu7DedVSvv7+GMtj3g9r3nhJ
-  KqECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFI/o
-  maf34HXbUOQsdoLHacEKQgunMB0GA1UdEQQWMBSBEmFkbWluc0BzaG9waWZ5LmNv
-  bTAdBgNVHRIEFjAUgRJhZG1pbnNAc2hvcGlmeS5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBADkK9aj5T0HPExsov4EoMWFnO+G7RQ28C30VAfKxnL2UxG6i4XMHVs6Xi94h
-  qXFw1ec9Y2eDUqaolT3bviOk9BB197+A8Vz/k7MC6ci2NE+yDDB7HAC8zU6LAx8Y
-  Iqvw7B/PSZ/pz4bUVFlTATif4mi1vO3lidRkdHRtM7UePSn2rUpOi0gtXBP3bLu5
-  YjHJN7wx5cugMEyroKITG5gL0Nxtu21qtOlHX4Hc4KdE2JqzCPOsS4zsZGhgwhPs
-  fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
-  TConQSX2BnZdhIEYW+cKzEC/bLc=
-  -----END CERTIFICATE-----
-date: 2014-05-27 00:00:00.000000000 Z
+cert_chain: []
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.14.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.14.4
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   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: pry-debugger
   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'
 description: Command line tool to help with developing Shopify themes. Provides simple
@@ -168,9 +160,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -194,18 +187,20 @@ 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: shopify_theme
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command line tool for developing themes
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/unit/cli_spec.rb

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-0Ϲ���cC��:\�H�%3�_R��L����o��r���4�X*�[�(.0�����L�p����ؑ`�������dahs�@#ն���^w�+�)zL��TP��H��&Oy:S$�NJ'�p�{F�P�+&h��	d�ī�Bȯ;��ψ�D��橦Е
��&+RNǙ_���v	:L��K�����<:��J|�E7hMVTL�L���K�4:��K��Q���ե[8޿w*�U��	q�yQ�V��: