opencode_theme 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2995bdcd55b2874d519fb2f4653ddac6441471
-  data.tar.gz: 7ac1b792ea2f5f8b5bbe589def50a308781430ba
+  metadata.gz: 984d1ba98be1a73eb1c8034d967000d49a20a0a4
+  data.tar.gz: 55c366e05c5e6b1da0513fd3f67579ab1ed7c8df
 SHA512:
-  metadata.gz: 7fc3f4a94ba2841bd2b9401e8c932d50872de8e5bf569b614e2f40c357e4648e00b104f78a1ffe9cb1ef0423d1a12a75ed3a7a5231b428e0424d523a951ae4a8
-  data.tar.gz: 83c17ca7ea25b31c3c74fa63f25e6d2137fd95976b438168c961b5f7ce31ba21a870c3769e82f3b3df79d7134f97bde14a893aadd7a6a15b452dbf10dacf2f3e
+  metadata.gz: c5255cfedecba38a26ee93e1039b96d53b2faed252d2919993beb0bf391cc5e0c44a816196a6b6978827f4d7f21a4bcd457c3c7e95aa5597600d2f9c17349e0a
+  data.tar.gz: 5fd046f49700f4f685128df8794823b2e8b10f8e4db3b8576a803d52a2842cf8bd1fe9dafd272914487d45e0b17ad0180c26cf9fea94034f2a4d92086a9bd565

data/lib/opencode_theme/base_service.rb

@@ -4,66 +4,68 @@ module OpencodeTheme
   default_options.update(verify: false)
   @@current_api_call_count = 0
   @@total_api_calls = 40
-  URL_API = "https://opencode.tray.com.br"
+  URL_API = 'https://opencode.tray.com.br'
 
   def self.api_usage
-    "[API Limit: #{@@current_api_call_count || "??"}/#{@@total_api_calls || "??"}]"
+    "[API Limit: #{@@current_api_call_count || '??'}/#{@@total_api_calls || '??'}]"
   end
 
   def self.check_config
-    response = opencode_theme.post("/api/check", :query => {:theme_id => config[:theme_id] })
-    return {success: response.success?, response: JSON.parse(response.body)}
+    response = opencode_theme.post('/api/check', query: { theme_id: config[:theme_id] })
+    { success: response.success?, response: JSON.parse(response.body) }
   end
 
   def self.list
-    response = opencode_theme.get("/api/list")
-    return {success: response.success?, response: JSON.parse(response.body)}
+    response = opencode_theme.get('/api/list')
+    { success: response.success?, response: JSON.parse(response.body) }
   end
 
- def self.clean
-   response = opencode_theme.post("/api/clean_cache", :query => {:theme_id => config[:theme_id] })
-   return {success: response.success?, response: JSON.parse(response.body)}
- end
+  def self.clean
+    response = opencode_theme.post('/api/clean_cache', query: { theme_id: config[:theme_id] })
+    { success: response.success?, response: JSON.parse(response.body) }
+  end
 
   def self.theme_delete(theme_id)
-    response = opencode_theme.delete("/api/themes/#{theme_id}", :parser => NOOPParser)
-    return {success: response.success?, response: JSON.parse(response.body)}
+    response = opencode_theme.delete("/api/themes/#{theme_id}", parser: NOOPParser)
+    { success: response.success?, response: JSON.parse(response.body) }
   end
 
   def self.theme_new(theme_base, theme_name)
-    response = opencode_theme.post("/api/themes", :body => {:theme => {:theme_base => theme_name, :name => theme_name}}.to_json,
-      :headers => { 'Content-Type' => 'application/json'}, :parser => NOOPParser)
-     assets   = response.code == 200 ? JSON.parse(response.body)["assets"] : {}
-     return {success: response.success?, assets: assets, response: JSON.parse(response.body)}
+    response = opencode_theme.post('/api/themes',
+                                   body: { theme: { theme_base: theme_name, name: theme_name } }.to_json,
+                                   headers: { 'Content-Type' => 'application/json'},
+                                   parser: NOOPParser)
+    assets = response.code == 200 ? JSON.parse(response.body)["assets"] : {}
+    { success: response.success?, assets: assets, response: JSON.parse(response.body) }
   end
 
   def self.asset_list
-    response = opencode_theme.get(path, :parser => NOOPParser)
-    assets = response.code == 200 ? JSON.parse(response.body)["assets"].collect {|a| a['key'][1..a['key'].length] } : {}
+    response = opencode_theme.get(path, parser: NOOPParser)
+    assets = response.code == 200 ? JSON.parse(response.body)['assets'].collect {|a| a['key'][1..a['key'].length] } : {}
     assets
   end
 
   def self.get_asset(asset)
-      response = opencode_theme.get(path, :query => {:key => "/#{asset}"}, :parser => NOOPParser)
-      asset = response.code == 200 ? JSON.parse(response.body) : ""
-      asset
+    response = opencode_theme.get(path, query: { key: "/#{asset}" }, parser: NOOPParser)
+    asset = response.code == 200 ? JSON.parse(response.body) : ''
+    asset
   end
 
   def self.send_asset(data)
-    response = opencode_theme.put(path, :body => data)
+    response = opencode_theme.put(path, body: data)
     response
   end
 
   def self.delete_asset(asset)
-    response = opencode_theme.delete(path, :body => {:key => "/#{asset}"})
+    response = opencode_theme.delete(path, body: { key: "/#{asset}" })
     response
   end
 
-private
+  private
+
   def self.opencode_theme
     base_uri URL_API
-    headers  "Authorization" => "Token token=#{config[:api_key]}_#{config[:password]}"
+    headers "Authorization" => "Token token=#{config[:api_key]}_#{config[:password]}"
     OpencodeTheme
   end
-
 end

data/lib/opencode_theme/cli.rb

@@ -9,79 +9,83 @@ require 'json'
 require 'filewatcher'
 require 'launchy'
 require 'mimemagic'
+
 MimeMagic.add('application/json', extensions: %w(json js), parents: 'text/plain')
 MimeMagic.add('application/x-pointplus', extensions: %w(scss), parents: 'text/css')
 MimeMagic.add('application/vnd.ms-fontobject', extensions: %w(eot), parents: 'font/opentype')
 
-
 module OpencodeTheme
   class Cli < Thor
     include Thor::Actions
 
     IGNORE = %w(config.yml)
     DEFAULT_WHITELIST = %w(configs/ css/ elements/ img/ layouts/ pages/ js/)
-    TIMEFORMAT = "%H:%M:%S"
+    TIMEFORMAT = '%H:%M:%S'
 
     tasks.keys.abbrev.each do |shortcut, command|
       map shortcut => command.to_sym
     end
 
-    desc "configure API_KEY PASSWORD THEME_ID", "Configura o tema que sera modificado"
-    def configure(api_key=nil, password=nil, theme_id=nil)
-      config = {:api_key => api_key, :password => password, :theme_id => theme_id}
+    map 'new' => :bootstrap
+    map 'rm' => :remove
+
+    desc 'configure API_KEY PASSWORD THEME_ID', 'Configura o tema que sera modificado'
+    def configure(api_key = nil, password = nil, theme_id = nil)
+      config = { api_key: api_key, password: password, theme_id: theme_id }
       OpencodeTheme.config = config
       response = OpencodeTheme.check_config
       if response[:success]
-        config.merge!(:preview_url => response[:response]['preview'])
-        create_file('config.yml', config.to_yaml, :force => true)
-        say("Configuration [OK]", :green)
+        config.merge!(preview_url: response[:response]['preview'])
+        create_file('config.yml', config.to_yaml, force: true)
+        say('Configuration [OK]', :green)
       else
-        say("Configuration [FAIL]", :red)
+        say('Configuration [FAIL]', :red)
       end
     end
 
-    desc "list", "Lista todos os temas da loja"
+    desc 'list', 'Lista todos os temas da loja'
     def list
       config = OpencodeTheme.config
       response = OpencodeTheme.list
       if response[:success]
         say("\n")
-        response[:response]["themes"].each do |theme|
-          color = theme['published'] == "1" ? :green : :red
-          say("Theme name:   ", color)
+        response[:response]['themes'].each do |theme|
+          color = theme['published'] == '1' ? :green : :red
+          say('Theme name:   ', color)
           say("#{theme['name']}\n", color)
-          say("Theme ID:     ", color)
+          say('Theme ID:     ', color)
           say("#{theme['id']}\n", color)
-          say("Theme status: ", color)
+          say('Theme status: ', color)
           say("#{(theme['published'])}\n\n", color)
         end
       else
-        report_error(Time.now, "Could not list now", response[:response])
+        report_error(Time.now, 'Could not list now', response[:response])
       end
     end
 
-    desc "clean", "Limpa o cache de arquivos estáticos"
+    desc 'clean', 'Limpa o cache de arquivos estáticos'
+
     def clean
       config = OpencodeTheme.config
       response = OpencodeTheme.clean
         if response[:success]
-          say("Clean cache [OK]\n",  :green)
+          say('Clean cache [OK]\n', :green)
         else
-          say("Clean cache [FAIL]",  :red)
+          say('Clean cache [FAIL]', :red)
         end
       end
 
-    desc "bootstrap API_KEY PASSWORD THEME_NAME THEME_BASE", "Cria um novo tema com o nome informado"
-    method_option :master, :type => :boolean, :default => false
-    def bootstrap(api_key=nil, password=nil, theme_name='default', theme_base='default')
-      OpencodeTheme.config = {:api_key => api_key, :password => password}
+    desc 'bootstrap API_KEY PASSWORD THEME_NAME THEME_BASE', 'Cria um novo tema com o nome informado'
+    method_option :master, type: :boolean, default: false
+    def bootstrap(api_key = nil, password = nil, theme_name = 'default', theme_base = 'default')
+      OpencodeTheme.config = { api_key: api_key, password: password }
 
       check_config = OpencodeTheme.check_config
 
       if check_config[:success]
-        say("Configuration [OK]", :green)
+        say('Configuration [OK]', :green)
       else
-        report_error(Time.now, "Configuration [FAIL]", check_config[:response])
+        report_error(Time.now, 'Configuration [FAIL]', check_config[:response])
         return
       end
 
@@ -90,7 +94,7 @@ module OpencodeTheme
       if response[:success]
         say("Create #{theme_name} theme on store", :green)
       else
-        report_error(Time.now, "Could not create a new theme", response[:response])
+        report_error(Time.now, 'Could not create a new theme', response[:response])
         return
       end
 
@@ -103,18 +107,18 @@ module OpencodeTheme
 
       say("Downloading #{theme_name} assets from Opencode")
       Dir.chdir(theme_name)
-      download()
+      download
     end
 
-    desc "open", "Abre a loja no navegador"
+    desc 'open', 'Abre a loja no navegador'
     def open(*keys)
       if Launchy.open opencode_theme_url
-        say("Done.", :green)
+        say('Done.', :green)
       end
     end
 
-    desc "download FILE", "Baixa o arquivo informado ou todos se FILE for omitido"
-    method_option :quiet, :type => :boolean, :default => false
+    desc 'download FILE', 'Baixa o arquivo informado ou todos se FILE for omitido'
+    method_option :quiet, type: :boolean, default: false
     method_option :exclude
     def download(*keys)
       assets = keys.empty? ? OpencodeTheme.asset_list : keys
@@ -123,35 +127,35 @@ module OpencodeTheme
       end
 
       assets.each do |asset|
-      asset = URI.decode(asset)
+        asset = URI.decode(asset)
         download_asset(asset)
         say("#{OpencodeTheme.api_usage} Downloaded: #{asset}", :green) unless options['quiet']
       end
-      say("Done.", :green) unless options['quiet']
+      say('Done.', :green) unless options['quiet']
     end
 
-    desc "upload FILE", "Sobe o arquivo informado ou todos se FILE for omitido"
-    method_option :quiet, :type => :boolean, :default => false
+    desc 'upload FILE', 'Sobe o arquivo informado ou todos se FILE for omitido'
+    method_option :quiet, type: :boolean, default: false
     def upload(*keys)
       assets = keys.empty? ? local_assets_list : keys
       assets.each do |asset|
         send_asset("#{asset}", options['quiet'])
       end
-      say("Done.", :green) unless options['quiet']
+      say('Done.', :green) unless options['quiet']
     end
 
-    desc "remove FILE", "Remove um arquivo do tema (apenas se o tema nao estiver publicado)"
-    method_option :quiet, :type => :boolean, :default => false
+    desc 'remove FILE', 'Remove um arquivo do tema (apenas se o tema nao estiver publicado)'
+    method_option :quiet, type: :boolean, default: false
     def remove(*keys)
       keys.each do |key|
         delete_asset(key, options['quiet'])
       end
-      say("Done.", :green) unless options['quiet']
+      say('Done.', :green) unless options['quiet']
     end
 
-    desc "watch", "Baixa e sobe um arquivo sempre que ele for salvo"
-    method_option :quiet, :type => :boolean, :default => false
-    method_option :keep_files, :type => :boolean, :default => false
+    desc 'watch', 'Baixa e sobe um arquivo sempre que ele for salvo'
+    method_option :quiet, type: :boolean, default: false
+    method_option :keep_files, type: :boolean, default: false
     def watch
       watcher do |filename, event|
         filename = filename.gsub("#{Dir.pwd}/", '')
@@ -160,7 +164,7 @@ module OpencodeTheme
           next
         end
         action = if [:changed, :new].include?(event)
-          :send_asset
+                    :send_asset
         elsif event == :delete
           :delete_asset
         else
@@ -170,26 +174,25 @@ module OpencodeTheme
       end
     end
 
-    desc "systeminfo", "Mostra informacoes do sistema"
+    desc 'systeminfo', 'Mostra informacoes do sistema'
     def systeminfo
       ruby_version = "#{RUBY_VERSION}"
       ruby_version += "-p#{RUBY_PATCHLEVEL}" if RUBY_PATCHLEVEL
       puts "Ruby: v#{ruby_version}"
       puts "Operating System: #{RUBY_PLATFORM}"
-      %w(Listen HTTParty Launchy).each do |lib|
+      %w(HTTParty Launchy).each do |lib|
         require "#{lib.downcase}/version"
-        puts "#{lib}: v" +  Kernel.const_get("#{lib}::VERSION")
+        puts "#{lib}: v" + Kernel.const_get("#{lib}::VERSION")
       end
     end
 
-
-protected
+    protected
 
     def config
       @config ||= YAML.load_file 'config.yml'
     end
 
-private
+    private
 
     def notify_and_sleep(message)
       say(message, :red)
@@ -197,14 +200,13 @@ private
     end
 
     def binary_file?(path)
-     !MimeMagic.by_path(path).text?
+      !MimeMagic.by_path(path).text?
     end
 
     def opencode_theme_url
       config[:preview_url]
     end
 
-
     def send_asset(asset, quiet = false)
       if valid_name?(asset)
         return unless valid?(asset)
@@ -227,7 +229,7 @@ private
       end
     end
 
-    def delete_asset(key, quiet=false)
+    def delete_asset(key, quiet = false)
       return unless valid?(key)
       response = show_during("[#{timestamp}] Removing: #{key}", quiet) do
         OpencodeTheme.delete_asset(key)
@@ -240,7 +242,7 @@ private
     end
 
     def watcher
-      FileWatcher.new(Dir.pwd).watch() do |filename, event|
+      FileWatcher.new(Dir.pwd).watch do |filename, event|
         yield("#{filename}", event)
       end
     end
@@ -270,12 +272,12 @@ private
       time.strftime(TIMEFORMAT)
     end
 
-     def valid_name?(key)
-      name = key.split("/").last
+    def valid_name?(key)
+      name = key.split('/').last
       if name =~ /^[0-9a-zA-Z\-_.]+\.(ttf|eot|svg|woff|css|scss|html|js|jpg|gif|png|json|TTF|EOT|SVG|WOFF|CSS|SCSS|HTML|JS|PNG|GIF|JPG|JSON)$/
         valid =  true
       else
-         report_error(Time.now, "INVALID NAME #{name}", key)
+        report_error(Time.now, "INVALID NAME #{name}", key)
       end
       valid
     end
@@ -283,22 +285,22 @@ private
     def download_asset(key)
       if valid_name?(key)
         return unless valid?(key)
-        notify_and_sleep("Approaching limit of API permits. Naptime until more permits become available!") if OpencodeTheme.needs_sleep?
+        notify_and_sleep('Approaching limit of API permits. Naptime until more permits become available!') if OpencodeTheme.needs_sleep?
         asset = OpencodeTheme.get_asset(URI.encode(key))
         unless asset['key']
           report_error(Time.now, "Could not download #{key}", asset)
           return
         end
         if asset['content']
-         content = Base64.decode64(asset['content'])
-         content = content.force_encoding("UTF-8")
-          format = "w+b:ISO-8859-1"
+          content = Base64.decode64(asset['content'])
+          content = content.force_encoding('UTF-8')
+          format = 'w+b:ISO-8859-1'
         elsif asset['attachment']
           content = Base64.decode64(asset['attachment'])
-          format = "w+b"
+          format = 'w+b'
         end
         FileUtils.mkdir_p(File.dirname(URI.decode(key)))
-        File.open(key, format) {|f| f.write content} if content
+        File.open(key, format) { |f| f.write content } if content
       end
     end
 
@@ -313,7 +315,5 @@ private
       say("[#{timestamp(time)}] Error: #{message}", :red)
       say("Error Details: #{response}", :yellow)
     end
-
   end
-
 end

data/lib/opencode_theme/version.rb

@@ -1,3 +1,3 @@
 module OpencodeTheme
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/opencode_theme.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://tray-tecnologia.github.io/theme-template/"
   spec.license       = "MIT"
 
-  spec.add_dependency('thor', '>= 0.14.4')
+  spec.add_dependency('thor', '>= 0.19.1')
   spec.add_dependency('httparty', '~> 0.13.0')
   spec.add_dependency('json', '~> 1.8.0')
   spec.add_dependency('mimemagic')

data/spec/functional/functional_spec.rb

@@ -42,8 +42,20 @@ describe OpencodeTheme::Cli, :functional do
       expect(File.exists? 'config.yml').to eq false
     end
     
-    it 'creates config.yml when called with parameters' do
-      output = capture(:stdout) { subject.configure API_KEY, PASSWORD }
+    it 'fails to create config.yml file when called with inexistent theme_id' do
+      output = capture(:stdout) { subject.configure API_KEY, PASSWORD, 2147483647 }
+      expect(output).to include 'Configuration [FAIL]'
+      expect(File.exists? 'config.yml').to eq false
+    end
+    
+    it 'fails to create config.yml file when called with invalid theme_id' do
+      output = capture(:stdout) { subject.configure API_KEY, PASSWORD, 'aaa' }
+      expect(output).to include 'Configuration [FAIL]'
+      expect(File.exists? 'config.yml').to eq false
+    end
+    
+    it 'creates config.yml when called with valid theme_id' do
+      output = capture(:stdout) { subject.configure API_KEY, PASSWORD, 1 }
       expect(output).to include 'Configuration [OK]'
       expect(File.exists? 'config.yml').to eq true
     end
@@ -88,6 +100,7 @@ describe OpencodeTheme::Cli, :functional do
       expect(output).to include 'Downloaded'
       expect(output).to include "Downloaded: #{ FILE_NAME }"
       expect(output).not_to include 'Error'
+      expect(output).not_to include 'Net::ReadTimeout'
       expect(output).to include 'Done.'
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencode_theme
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Rafael Takashi Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement