shopify_theme 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6157b9bdb277a5335fb30d287296a7d190678f6d
-  data.tar.gz: 4d67641a71dbf5f44a3b96296fa749761fcedefa
+  metadata.gz: 8b849c05437407aeafa434479b6f2f198a3dc475
+  data.tar.gz: f33e3b4294a93ce747a650c3bc65e67f82bef9d6
 SHA512:
-  metadata.gz: 88bae8b6b99275741f476858dedcadab0bb2216a791c1f7715dee1e1ad4dfb4992a07bee500ababbaecc21004a5abc89a1cdf7a0690f1dd634c33176d8eb6bce
-  data.tar.gz: 357a5dd0f6875e1ba8d77f756022bdbcb6865158dca36a513a8991cee735bd84fc59ae7e1ccedfbe1f4b68274d665cee3e046dbe05570eb46adbd9f09a057590
+  metadata.gz: 21aa13d50791237942291edf030d96a624879809e53487b4251c40e1551f5e190b0703b6d2c1f4067e74e89ca94f18bfe876504ae9172e91deba84a2a9c47b95
+  data.tar.gz: 8e3a476aabbfce33e154c1d42014f54a63a285c027d96cedb04caa84bbe29ac0d3ae1a08714ae81d40d459ac531f2212f3778ffa07df1836ac35aead254958a7

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+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��:

data/README.md

@@ -33,7 +33,7 @@ gem update shopify_theme
 
 # Usage
 
-Generate the config file. Go get a valid api_key and password for your store head to `https://[your store].myshopify.com/admin/apps/private` and generate a private application. Default it adds the main theme, if you want to edit one of your other themes, add the `theme_id`.
+Generate the config file. Go get a valid api_key and password for your store head to `https://[your store].myshopify.com/admin/apps/private` and generate a private application. By default it adds the main theme, if you want to edit one of your other themes, add the `theme_id`.
 
 ```
 theme configure api_key password store_url

data/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
-Bundler::GemHelper.install_tasks
 
 task :default => [:spec]
 

data/bin/theme

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# This allows shopify_them to run easily from a git checkout without install.
+# This allows shopify_theme to run easily from a git checkout without install.
 # Hat tip to chriseppstein of Compass fame for the code for this
 def fallback_load_path(path)
   retried = false

data/lib/shopify_theme/cli.rb

@@ -44,14 +44,14 @@ module ShopifyTheme
       theme_name ||= 'Timber'
       say("Registering #{theme_name} theme on #{store}", :green)
       theme = ShopifyTheme.upload_timber(theme_name, master || false)
-      
+
       say("Creating directory named #{theme_name}", :green)
       empty_directory(theme_name)
-      
+
       say("Saving configuration to #{theme_name}", :green)
       ShopifyTheme.config.merge!(theme_id: theme['id'])
       create_file("#{theme_name}/config.yml", ShopifyTheme.config.to_yaml)
-      
+
       say("Downloading #{theme_name} assets from Shopify")
       Dir.chdir(theme_name)
       download()
@@ -126,14 +126,14 @@ module ShopifyTheme
       puts "Watching current folder: #{Dir.pwd}"
       watcher do |filename, event|
         filename = filename.gsub("#{Dir.pwd}/", '')
-        if local_assets_list.include?(filename)
-          action = case event
-          when :changed, :new then :send_asset
-          when :delete then :delete_asset
-          else raise NotImplementedError, "Unknown event -- #{event}"
-          end
-          send(action, filename, options['quiet'])
-        end
+        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
+        send(action, filename, options['quiet'])
       end
     end
 
@@ -201,7 +201,6 @@ module ShopifyTheme
 
     def send_asset(asset, quiet=false)
       return unless valid?(asset)
-      time = Time.now
       data = {:key => asset}
       content = File.read(asset)
       if BINARY_EXTENSIONS.include?(File.extname(asset).gsub('.','')) || ShopifyTheme.is_binary_data?(content)
@@ -211,21 +210,25 @@ module ShopifyTheme
         data.merge!(:value => content)
       end
 
-      response = ShopifyTheme.send_asset(data)
+      response = show_during("[#{timestamp}] Uploading: #{asset}", quiet) do
+        ShopifyTheme.send_asset(data)
+      end
       if response.success?
-        say("[" + time.strftime(TIMEFORMAT) + "] Uploaded: #{asset}", :green) unless quiet
+        say("[#{timestamp}] Uploaded: #{asset}", :green) unless quiet
       else
-        report_error(time, "Could not upload #{asset}", response)
+        report_error(Time.now, "Could not upload #{asset}", response)
       end
     end
 
     def delete_asset(key, quiet=false)
       return unless valid?(key)
-      time = Time.now
-      if (response = ShopifyTheme.delete_asset(key)).success?
-        say("[" + time.strftime(TIMEFORMAT) + "] Removed: #{key}", :green) unless quiet
+      response = show_during("[#{timestamp}] Removing: #{key}", quiet) do
+        ShopifyTheme.delete_asset(key)
+      end
+      if response.success?
+        say("[#{timestamp}] Removed: #{key}", :green) unless quiet
       else
-        report_error(time, "Could not remove #{key}", response)
+        report_error(Time.now, "Could not remove #{key}", response)
       end
     end
 
@@ -242,7 +245,7 @@ module ShopifyTheme
     end
 
     def report_error(time, message, response)
-      say("[#{time.strftime(TIMEFORMAT)}] Error: #{message}", :red)
+      say("[#{timestamp(time)}] Error: #{message}", :red)
       say("Error Details: #{errors_from_response(response)}", :yellow)
     end
 
@@ -252,15 +255,26 @@ module ShopifyTheme
       errors = response.parsed_response ? response.parsed_response["errors"] : response.body
 
       object[:errors] = case errors
-      when NilClass
-        ''
-      when String
-        errors.strip
-      else
-        errors.values.join(", ")
-      end
+                        when NilClass
+                          ''
+                        when String
+                          errors.strip
+                        else
+                          errors.values.join(", ")
+                        end
       object.delete(:errors) if object[:errors].length <= 0
       object
     end
+
+    def show_during(message = '', quiet = false, &block)
+      print(message) unless quiet
+      result = yield
+      print("\r#{' ' * message.length}\r") unless quiet
+      result
+    end
+
+    def timestamp(time = Time.now)
+      time.strftime(TIMEFORMAT)
+    end
   end
 end

data/lib/shopify_theme/version.rb

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

data/shipit.rubygems.yml

@@ -0,0 +1 @@
+# using the default shipit config

data/shopify_theme.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.rubyforge_project = "shopify_theme"
-  s.add_dependency("thor", [">= 0.14.4"])
-  s.add_dependency("httparty", "~> 0.10.0")
-  s.add_dependency("json", "~> 1.5.4")
-  s.add_dependency("filewatcher")
-  s.add_dependency("launchy")
+  s.add_dependency('thor', '>= 0.14.4')
+  s.add_dependency('httparty', '~> 0.13.0')
+  s.add_dependency('json', '~> 1.8.0')
+  s.add_dependency('filewatcher')
+  s.add_dependency('launchy')
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest', '>= 5.0.0'
@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 end

metadata

@@ -1,139 +1,161 @@
 --- !ruby/object:Gem::Specification
 name: shopify_theme
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - John Duff
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+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
 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.10.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.8.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
@@ -146,8 +168,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -158,6 +180,7 @@ files:
 - lib/shopify_theme.rb
 - lib/shopify_theme/cli.rb
 - lib/shopify_theme/version.rb
+- shipit.rubygems.yml
 - shopify_theme.gemspec
 - spec/spec_helper.rb
 - spec/unit/cli_spec.rb
@@ -171,20 +194,18 @@ 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.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Command line tool for developing themes
-test_files:
-- spec/spec_helper.rb
-- spec/unit/cli_spec.rb
+test_files: []