opencode_theme 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 984d1ba98be1a73eb1c8034d967000d49a20a0a4
-  data.tar.gz: 55c366e05c5e6b1da0513fd3f67579ab1ed7c8df
+  metadata.gz: 50a078e9de7768e1b3ad4439d66279058b46c7d7
+  data.tar.gz: 8d8813b24adc34d37a84b929308ea9aabd1c6345
 SHA512:
-  metadata.gz: c5255cfedecba38a26ee93e1039b96d53b2faed252d2919993beb0bf391cc5e0c44a816196a6b6978827f4d7f21a4bcd457c3c7e95aa5597600d2f9c17349e0a
-  data.tar.gz: 5fd046f49700f4f685128df8794823b2e8b10f8e4db3b8576a803d52a2842cf8bd1fe9dafd272914487d45e0b17ad0180c26cf9fea94034f2a4d92086a9bd565
+  metadata.gz: ec7cc150e37db2b7a7f28713da5727d1d4d0a2eb2c29acebcbcc6be578989a6cf98a71a0e25f61cee1e54ca76714b3ef3d8e9271c4daf8a6cad34eb506350b9f
+  data.tar.gz: e4ea09cc4b0b1f84c2a13a0ad5e4307913f71631dfd3b4c80dff53ae227860b06848bf0681ba27dfb9ffaa3ade037fd673117c271d6e6794b75786d4107e37a4

data/lib/opencode_theme/base_service.rb

@@ -11,53 +11,57 @@ module OpencodeTheme
   end
 
   def self.check_config
-    response = opencode_theme.post('/api/check', query: { theme_id: config[:theme_id] })
+    response = opencode_theme.post('/api/check', query: { theme_id: config[:theme_id],
+                                                          gem_version: OpencodeTheme::VERSION })
     { success: response.success?, response: JSON.parse(response.body) }
   end
 
   def self.list
-    response = opencode_theme.get('/api/list')
+    response = opencode_theme.get('/api/list', query: { gem_version: OpencodeTheme::VERSION })
     { 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] })
+    response = opencode_theme.post('/api/clean_cache', query: { theme_id: config[:theme_id],
+                                                                gem_version: OpencodeTheme::VERSION })
     { 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)
+    response = opencode_theme.delete("/api/themes/#{theme_id}", parser: NOOPParser, query: { gem_version: OpencodeTheme::VERSION })
     { 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,
+                                   query: { gem_version: OpencodeTheme::VERSION },
+                                   body: { theme: { theme_base: theme_name, name: theme_name, gem_version: OpencodeTheme::VERSION } }.to_json,
                                    headers: { 'Content-Type' => 'application/json'},
-                                   parser: NOOPParser)
+                                   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, query: { gem_version: OpencodeTheme::VERSION })
+    assets = response.code == 200 ? JSON.parse(response.body)['assets'].collect {|a| a['key'][1..a['key'].length] } : response.body
     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) : ''
+    response = opencode_theme.get(path, query: { key: "/#{asset}", gem_version: OpencodeTheme::VERSION }, parser: NOOPParser)
+    asset = response.code == 200 ? JSON.parse(response.body) : JSON.parse(response.body)
     asset
   end
 
   def self.send_asset(data)
+    data[:gem_version] = OpencodeTheme::VERSION
     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}" }, query: { key: "/#{asset}", gem_version: OpencodeTheme::VERSION })
     response
   end
 

data/lib/opencode_theme/cli.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'pry'
 require 'thor'
 require 'yaml'
 YAML::ENGINE.yamler = 'syck' if defined? Syck
@@ -32,14 +33,21 @@ module OpencodeTheme
     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 }
+
+      if api_key.nil? || password.nil? || theme_id.nil?
+        response = {}
+        response["message"] = 'necessário informar api_key e password e theme_id.'
+        return report_error(Time.now, 'Configuration [FAIL]', response)
+      end
       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)
       else
-        say('Configuration [FAIL]', :red)
+        report_error(Time.now, 'Configuration [FAIL]', response[:response])
       end
     end
 
@@ -47,6 +55,12 @@ module OpencodeTheme
     def list
       config = OpencodeTheme.config
       response = OpencodeTheme.list
+    if response[:response]["authentication"] == false
+      response = {}
+      response["message"] = 'necessário autenticação'
+      return report_error(Time.now, 'Configuration [FAIL]', response)
+    end
+
       if response[:success]
         say("\n")
         response[:response]['themes'].each do |theme|
@@ -68,18 +82,17 @@ module OpencodeTheme
     def clean
       config = OpencodeTheme.config
       response = OpencodeTheme.clean
-        if response[:success]
-          say('Clean cache [OK]\n', :green)
-        else
-          say('Clean cache [FAIL]', :red)
-        end
+      if response[:success]
+        say('Clean cache [OK]\n', :green)
+      else
+        report_error(Time.now, 'Clean cache [FAIL]', response[:response])
       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 }
-
       check_config = OpencodeTheme.check_config
 
       if check_config[:success]
@@ -122,16 +135,21 @@ module OpencodeTheme
     method_option :exclude
     def download(*keys)
       assets = keys.empty? ? OpencodeTheme.asset_list : keys
+      if assets.is_a? String
+        return report_error(Time.now, "List Could not download", JSON.parse(assets))
+      end
       if options['exclude']
         assets = assets.delete_if { |asset| asset =~ Regexp.new(options['exclude']) }
       end
-
       assets.each do |asset|
         asset = URI.decode(asset)
-        download_asset(asset)
-        say("#{OpencodeTheme.api_usage} Downloaded: #{asset}", :green) unless options['quiet']
+        download = download_asset(asset)
+        if download
+
+          say("#{OpencodeTheme.api_usage} Downloaded: #{asset}", :green) unless options['quiet'] || !download
+          say('Done.', :green) unless options['quiet']
+       end
       end
-      say('Done.', :green) unless options['quiet']
     end
 
     desc 'upload FILE', 'Sobe o arquivo informado ou todos se FILE for omitido'
@@ -156,21 +174,44 @@ module OpencodeTheme
     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}/", '')
+    #     unless local_assets_list.include?(filename)
+    #       say("Unknown file [#{filename}]", :red)
+    #       next
+    #     end
+    #     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
     def watch
       watcher do |filename, event|
         filename = filename.gsub("#{Dir.pwd}/", '')
-        unless local_assets_list.include?(filename)
-          say("Unknown file [#{filename}]", :red)
-          next
-        end
+      if is_file?(filename)
+
         action = if [:changed, :new].include?(event)
-                    :send_asset
+          :send_asset
         elsif event == :delete
           :delete_asset
         else
+          say("This is not file [#{filename}]", :blue)
           raise NotImplementedError, "Unknown event -- #{event} -- #{filename}"
         end
         send(action, filename, options['quiet'])
+      else
+        next
+      end
+
+
       end
     end
 
@@ -179,6 +220,8 @@ module OpencodeTheme
       ruby_version = "#{RUBY_VERSION}"
       ruby_version += "-p#{RUBY_PATCHLEVEL}" if RUBY_PATCHLEVEL
       puts "Ruby: v#{ruby_version}"
+      puts "OpencodeTheme: v:" + OpencodeTheme::VERSION
+
       puts "Operating System: #{RUBY_PLATFORM}"
       %w(HTTParty Launchy).each do |lib|
         require "#{lib.downcase}/version"
@@ -188,6 +231,10 @@ module OpencodeTheme
 
     protected
 
+    def is_file?(filename)
+      !FileTest.directory?(filename)
+    end
+
     def config
       @config ||= YAML.load_file 'config.yml'
     end
@@ -209,7 +256,8 @@ module OpencodeTheme
 
     def send_asset(asset, quiet = false)
       if valid_name?(asset)
-        return unless valid?(asset)
+        return unless is_file?(asset)
+        return unless valid_name?(asset)
         data = { key: "/#{asset}" }
         content = File.read("#{asset}")
         if binary_file?(asset) || OpencodeTheme.is_binary_data?(content)
@@ -222,20 +270,28 @@ module OpencodeTheme
           OpencodeTheme.send_asset(data)
         end
         if response.success?
-          say("[#{timestamp}] Uploaded: #{asset}", :green) unless quiet
+          say("[#{timestamp}] File uploaded: #{asset}", :green) unless quiet
         else
           report_error(Time.now, "Could not upload #{asset}", response)
         end
       end
     end
 
+    def temporary_file?(asset)
+      false unless asset.include?('~')
+    end
+
     def delete_asset(key, quiet = false)
-      return unless valid?(key)
+      return say("[#{timestamp}] Folder removed/rename: #{key}", :green) unless key.include?('.')
+      return exec_delete_file(key) if valid_name?(key)
+    end
+
+    def exec_delete_file(key, quiet = false)
       response = show_during("[#{timestamp}] Removing: #{key}", quiet) do
         OpencodeTheme.delete_asset(key)
       end
       if response.success?
-        say("[#{timestamp}] Removed: #{key}", :green) unless quiet
+        say("[#{timestamp}] File removed: #{key} ", :green) unless quiet
       else
         report_error(Time.now, "Could not remove #{key}", response)
       end
@@ -249,7 +305,7 @@ module OpencodeTheme
 
     def local_assets_list
       local_files.reject do |p|
-        @permitted_files ||= (DEFAULT_WHITELIST | OpencodeTheme.whitelist_files).map{|pattern| Regexp.new(pattern)}
+        @permitted_files ||= (DEFAULT_WHITELIST | OpencodeTheme.whitelist_files).map{ |pattern| Regexp.new(pattern)}
         @permitted_files.none? { |regex| regex =~ p } || OpencodeTheme.ignore_files.any? { |regex| regex =~ p }
       end
     end
@@ -273,11 +329,15 @@ module OpencodeTheme
     end
 
     def valid_name?(key)
+      return if temporary_file?(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)
+        response = {}
+        response["message"] = 'verifique as regras de nome de arquivos:'
+        response["more_info"] = 'https://sites.google.com/a/tray.net.br/tecnologia/open-code/api?pli=1#00313'
+        report_error(Time.now, "Invalid name: #{name}", response)
       end
       valid
     end
@@ -286,17 +346,17 @@ module OpencodeTheme
       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?
-        asset = OpencodeTheme.get_asset(URI.encode(key))
-        unless asset['key']
-          report_error(Time.now, "Could not download #{key}", asset)
-          return
+        response = OpencodeTheme.get_asset(URI.encode(key))
+        unless response['key']
+          report_error(Time.now, "Could not download #{key}", response)
+          return false
         end
-        if asset['content']
-          content = Base64.decode64(asset['content'])
+        if response['content']
+          content = Base64.decode64(response['content'])
           content = content.force_encoding('UTF-8')
           format = 'w+b:ISO-8859-1'
-        elsif asset['attachment']
-          content = Base64.decode64(asset['attachment'])
+        elsif response['attachment']
+          content = Base64.decode64(response['attachment'])
           format = 'w+b'
         end
         FileUtils.mkdir_p(File.dirname(URI.decode(key)))
@@ -312,8 +372,12 @@ module OpencodeTheme
     end
 
     def report_error(time, message, response)
-      say("[#{timestamp(time)}] Error: #{message}", :red)
-      say("Error Details: #{response}", :yellow)
+      say("[#{timestamp(time)}] Error: #{message}", :red)  if message
+      if response
+        message_details = response["message"]
+        message_details = "#{message_details} \n #{response["more_info"]}" if !response["more_info"].nil?
+        say("Error Details: #{message_details}", :yellow)
+      end
     end
   end
 end

data/lib/opencode_theme/version.rb

@@ -1,3 +1,3 @@
 module OpencodeTheme
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 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.19.1')
+  spec.add_dependency('thor', '>= 0.14.4')
   spec.add_dependency('httparty', '~> 0.13.0')
   spec.add_dependency('json', '~> 1.8.0')
   spec.add_dependency('mimemagic')

data/spec/functional/functional_spec.rb

@@ -1,66 +1,71 @@
 require_relative '../spec_helper'
 
 describe OpencodeTheme::Cli, :functional do
-  
   STORE_ID = '430692'
   FILE_NAME = 'layouts/default.html'
   API_KEY = '11451c354c1f95fe60f80d7672bf184a'
   PASSWORD = '14ae838d9e971465af45b35803b8f0a4'
-  
+
+  before(:all) do
+    # clearing generated and downloaded files
+    FileUtils.rm_rf 'config.yml' if File.exist?('config.yml')
+    FileUtils.rm_rf 'default' if File.exist?('default')
+  end
+
   after(:all) do
     # clearing generated and downloaded files
-    FileUtils.rm 'config.yml'
+    FileUtils.rm_rf 'config.yml'
     FileUtils.rm_rf 'default'
   end
-  
+
   context 'Invalid or Inexistent Configuration' do
     it 'does not list when the config is invalid' do
       output = capture(:stdout) { subject.list }
-      expect(File.exists? 'config.yml').to eq false
+      expect(File.exist? 'config.yml').to eq false
       expect(output).to include 'config.yml does not exist!'
-      expect(output).to include 'Error: Could not list now'
-      expect(output).to include 'Error Details: {"authentication"=>false}'
+      expect(output).to include 'Error: Configuration [FAIL]'
+      expect(output).to include 'Error Details: necessário autenticação'
     end
-    
+
     it 'does not clean cache when the config is invalid' do
       output = capture(:stdout) { subject.clean }
-      expect(File.exists? 'config.yml').to eq false
+      expect(File.exist? 'config.yml').to eq false
       expect(output).to include 'Clean cache [FAIL]'
     end
-    
+
     it 'does not upload any file when the config is invalid' do
       output = capture(:stdout) { subject.upload }
       expect(output).not_to include 'Uploaded'
       expect(output).to include 'Done.'
     end
   end
-  
+
   context 'Configure' do
     it 'fails to create config.yml file when called with no arguments' do
       output = capture(:stdout) { subject.configure }
       expect(output).to include 'Configuration [FAIL]'
-      expect(File.exists? 'config.yml').to eq false
+      expect(File.exist? 'config.yml').to eq false
     end
-    
+
     it 'fails to create config.yml file when called with inexistent theme_id' do
-      output = capture(:stdout) { subject.configure API_KEY, PASSWORD, 2147483647 }
+      output = capture(:stdout) { subject.configure API_KEY, PASSWORD, 214_748_364_7 }
       expect(output).to include 'Configuration [FAIL]'
-      expect(File.exists? 'config.yml').to eq false
+      expect(File.exist? '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
+      expect(File.exist? '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
+      expect(File.exist? 'config.yml').to eq true
     end
   end
-  
+
   context 'Bootstrap' do
     it 'create new theme' do
       output = capture(:stdout) { subject.bootstrap API_KEY, PASSWORD }
@@ -69,11 +74,11 @@ describe OpencodeTheme::Cli, :functional do
       expect(output).to include 'Create default theme on store'
       expect(output).to include 'Saving configuration to default'
       expect(output).to include 'Downloading default assets from Opencode'
-      expect(output).to include "Downloaded: #{ FILE_NAME }"
+      expect(output).to include "Downloaded: #{FILE_NAME}"
       expect(output).to include 'Done.'
     end
   end
-  
+
   context 'List' do
     it 'lists all the themes from the store' do
       output = capture(:stdout) { subject.list }
@@ -82,71 +87,74 @@ describe OpencodeTheme::Cli, :functional do
       expect(output).to include 'Theme status:'
     end
   end
-  
+
   context 'Cleaning cache' do
     it 'cleans the cache' do
+      expect(File.exist? 'default').to eq true
       FileUtils.cd 'default'
       output = capture(:stdout) { subject.clean }
       FileUtils.cd '..'
       expect(output).to include 'Clean cache [OK]'
     end
   end
-  
+
   context 'Download' do
     it 'downloads all files' do
+      expect(File.exist? 'default').to eq true
       FileUtils.cd 'default'
       output = capture(:stdout) { subject.download }
       FileUtils.cd '..'
       expect(output).to include 'Downloaded'
-      expect(output).to include "Downloaded: #{ FILE_NAME }"
+      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
-    
+
     it 'downloads a single file' do
+      expect(File.exist? 'default').to eq true
       FileUtils.cd 'default'
       output = capture(:stdout) { subject.download FILE_NAME }
       FileUtils.cd '..'
-      expect(output).to include "Downloaded: #{ FILE_NAME }"
+      expect(output).to include "Downloaded: #{FILE_NAME}"
       expect(output).to include 'Done.'
       expect(output).not_to include 'Error'
     end
   end
-  
+
   context 'Upload' do
     it 'uploads all files' do
+      expect(File.exist? 'default').to eq true
       FileUtils.cd 'default'
+
       output = capture(:stdout) { subject.upload }
       FileUtils.cd '..'
-      expect(output).to include 'Uploaded'
-      expect(output).to include "Uploaded: #{ FILE_NAME }"
-      expect(output).not_to include 'Error'
+      expect(output).to include "File uploaded: #{FILE_NAME}"
       expect(output).to include 'Done.'
+      expect(output).not_to include 'Error'
     end
-    
+
     it 'uploads a single file' do
+      expect(File.exist? 'default').to eq true
       FileUtils.cd 'default'
       output = capture(:stdout) { subject.upload FILE_NAME }
       FileUtils.cd '..'
-      expect(output).to include "Uploaded: #{ FILE_NAME }"
+      expect(output).to include "File uploaded: #{FILE_NAME}"
       expect(output).to include 'Done.'
       expect(output).not_to include 'Error'
     end
   end
-  
+
   context 'System Information' do
     let(:output) { capture(:stdout) { subject.systeminfo } }
-    
+
     it 'displays system information' do
-      pending 'redmine issue 37576'
       expect(output).not_to be_nil
     end
   end
-  
+
   context 'Help' do
     let(:output) { capture(:stdout) { subject.help } }
-    
     it 'displays help about each command' do
       expect(output).to include 'Commands:'
       expect(output).to include 'bootstrap API_KEY PASSWORD THEME_NAME THEME_BASE'
@@ -162,5 +170,4 @@ describe OpencodeTheme::Cli, :functional do
       expect(output).to include 'watch'
     end
   end
-    
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencode_theme
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Rafael Takashi Tanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.14.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.14.4
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Provides simple commands to upload and donwload files from a themes