shopify_theme 0.0.24 → 0.0.25

data/lib/shopify_theme.rb

@@ -1,6 +1,9 @@
 require 'httparty'
 module ShopifyTheme
+  REMOTE_CERT_FILE = 'http://curl.haxx.se/ca/cacert.pem'
+  CA_CERT_FILE = File.expand_path(File.dirname(__FILE__) + '/certs/cacert.pem')
   include HTTParty
+  ssl_ca_file CA_CERT_FILE
   @@current_api_call_count = 0
   @@total_api_calls = 40
 

data/lib/shopify_theme/cli.rb

@@ -169,8 +169,10 @@ module ShopifyTheme
       puts "Watching current folder: #{Dir.pwd}"
       watcher do |filename, event|
         filename = filename.gsub("#{Dir.pwd}/", '')
-
-        action = if [:changed, :new].include?(event) && local_assets_list.include?(filename)
+        
+        next unless local_assets_list.include?(filename)
+        
+        action = if [:changed, :new].include?(event)
           :send_asset
         elsif event == :delete && !options['keep_files']
           :delete_asset
@@ -194,11 +196,13 @@ module ShopifyTheme
       end
     end
 
-    def local_assets_list
-      FileFilters.new(
-        Filters::Whitelist.new(ShopifyTheme.whitelist_files),
-        Filters::Blacklist.new(ShopifyTheme.ignore_files)
-      ).select(local_files)
+    no_commands do
+      def local_assets_list
+        FileFilters.new(
+          Filters::Whitelist.new(ShopifyTheme.whitelist_files),
+          Filters::Blacklist.new(ShopifyTheme.ignore_files)
+        ).select(local_files)
+      end
     end
 
     protected

data/lib/shopify_theme/version.rb

@@ -1,3 +1,3 @@
 module ShopifyTheme
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/spec/smoke/ca_cert_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'shopify_theme'
+require 'net/http'
+require 'uri'
+require 'digest'
+
+module Smoke
+  describe "CA Certificate Validity" do
+    before do
+      WebMock.disable!
+      unless ENV['VERIFY_CERT']
+        puts "Not testing CA certificates unless VERIFY_CERT variable is set"
+        skip
+      end
+    end
+
+    after do
+      WebMock.enable!
+    end
+
+    it "verifies that the local certificate matches with that on haxx.se" do
+      assert_equal digest(local_file), digest(remote_file)
+    end
+
+    def local_file
+      File.read(ShopifyTheme::CA_CERT_FILE)
+    end
+
+    def remote_file
+      cert_uri = URI(ShopifyTheme::REMOTE_CERT_FILE)
+      response = Net::HTTP.get_response(cert_uri)
+      if response.code == '200'
+        response.body
+      else
+        flunk "Could not connect to #{cert_uri}. Verify that certificate is still hosted."
+      end
+    end
+
+    def digest(message)
+      Digest::MD5.hexdigest(message)
+    end
+  end
+end

data/spec/unit/filters/blacklist_spec.rb

@@ -5,7 +5,7 @@ require 'shopify_theme/filters/blacklist'
 module ShopifyTheme
   module Filters
     describe "Blacklist" do
-      TEST_PATHS = %w(
+      BLACKLIST_TEST_PATHS = %w(
           settings.html
           config/item1.html
           config/item2.html
@@ -19,12 +19,12 @@ module ShopifyTheme
 
       it "should return the entire list back if initialized with no patterns" do
         blacklist = Blacklist.new
-        assert_equal TEST_PATHS, blacklist.select(TEST_PATHS)
+        assert_equal BLACKLIST_TEST_PATHS, blacklist.select(BLACKLIST_TEST_PATHS)
       end
 
       it "should return everything except for the items that matched the pattern" do
         blacklist = Blacklist.new(%w(config/* settings.html assets/* templates/* snippets/*))
-        assert_equal %w(layout/thing1.html), blacklist.select(TEST_PATHS)
+        assert_equal %w(layout/thing1.html), blacklist.select(BLACKLIST_TEST_PATHS)
       end
 
     end

data/spec/unit/filters/whitelist_spec.rb

@@ -4,7 +4,7 @@ require 'shopify_theme/filters/whitelist'
 module ShopifyTheme
   module Filters
     describe "Whitelist" do
-      TEST_PATHS = %w(
+      WHITELIST_TEST_PATHS = %w(
           settings.html
           config/item1.html
           config/item2.html
@@ -28,13 +28,13 @@ module ShopifyTheme
           templates/thing2.html
           snippets/fancy.liquid
         )
-        assert_equal expected, whitelist.select(TEST_PATHS)
+        assert_equal expected, whitelist.select(WHITELIST_TEST_PATHS)
       end
 
       it "should ignore the default 1+ whitelists were provided" do
         whitelist = Whitelist.new %w(settings.html config/item1.html config/item2.html config/item3.html layout/ templates/)
         expected = %w(settings.html config/item1.html config/item2.html config/item3.html layout/thing1.html templates/thing2.html)
-        assert_equal expected, whitelist.select(TEST_PATHS)
+        assert_equal expected, whitelist.select(WHITELIST_TEST_PATHS)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_theme
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - John Duff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,6 +171,7 @@ files:
 - bin/theme
 - doc/API-key-and-password.jpg
 - doc/how_to_find_theme_id.png
+- lib/certs/cacert.pem
 - lib/shopify_theme.rb
 - lib/shopify_theme/api_checker.rb
 - lib/shopify_theme/cli.rb
@@ -186,6 +187,7 @@ files:
 - spec/cassettes/api_check_success.yml
 - spec/cassettes/api_check_unauthorized.yml
 - spec/cassettes/timber_releases.yml
+- spec/smoke/ca_cert_spec.rb
 - spec/spec_helper.rb
 - spec/unit/api_checker_spec.rb
 - spec/unit/cli_spec.rb