insup 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ddabfbd03d3ec5598cf705493a8dbd48aeb1d3d
-  data.tar.gz: 511d852bd1c4cd25bb6214b22fff66b3f06655da
+  metadata.gz: 50dd77c58e2d1a3ce04bd92d4d7bc9c2d22f4af3
+  data.tar.gz: 1dcacbe9f405205fa16c3f8a827b96f934fb96d7
 SHA512:
-  metadata.gz: 9ebc75e74472e577ac81b3cec28c882a3b3b23f294f540c8d8cb60b793728271b45a14bd04046be164ec899b635c7c95408d849af6babdd4d1a3856b5351b51b
-  data.tar.gz: 3cda1702f037ffc0efbccbeb73d353f37683b78b030b821ca64a3b40c32ce03afca0072a5413b8e468e7cb493c00d5c775a81956e0e09129cde754423ae30a77
+  metadata.gz: 4ab17cb95225f9787d1fde6b20b20e5e4edecb93235ba584ed706b99ee15f786362747abb57b88109ca70b36baa320d89b13655828fbea2af85a188f9fbebf69
+  data.tar.gz: 95dbbdbd6fe84c8f10ff9799e61610dd5eb9b002266827e1e971d2ebc2178f4668aaeccfa334a907627bd7e3fad11fcf52ed1784a4f1bf0d519ba2e7b98b18f5

data/.gitignore

@@ -3,6 +3,7 @@ vendor/bundle
 .bundle
 .irb-history
 .insup
+*.swp
 log
 
 /.tags*

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.1.2
   - 1.9.3
 install: "bundle install --path vendor/bundle"
 cache:

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    insup (0.1.2)
+    insup (0.3)
       activeresource (~> 4.0)
       colorize (~> 0.7)
-      gli (~> 2.10)
+      gli (~> 2.11)
       listen (~> 2.7)
       match_files (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
     activeresource (4.0.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.1.1)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -35,38 +35,40 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     ffi (1.9.3)
-    gli (2.10.0)
-    i18n (0.6.9)
+    gli (2.11.0)
+    i18n (0.6.11)
     json (1.8.1)
-    listen (2.7.6)
+    listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     match_files (0.2)
     mime-types (2.3)
-    minitest (5.3.4)
+    minitest (5.4.0)
     multi_json (1.10.1)
+    netrc (0.7.7)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.7.1)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.0)
+    rspec-core (3.0.2)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.0)
+    rspec-expectations (3.0.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.0)
+    rspec-mocks (3.0.2)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.0)
+    rspec-support (3.0.2)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json

data/README.md

@@ -4,7 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/insup.svg)](http://badge.fury.io/rb/insup)
 [![Coverage Status](https://coveralls.io/repos/httplab/insup/badge.png)](https://coveralls.io/r/httplab/insup)
 [![Code Climate](https://codeclimate.com/github/httplab/insup.png)](https://codeclimate.com/github/httplab/insup)
-[![Dependency Status](https://gemnasium.com/httplab/insup.svg)](https://gemnasiurm.com/httplab/insup)
+[![Dependency Status](https://gemnasium.com/httplab/insup.svg)](https://gemnasium.com/httplab/insup)
 
 ## Description
 
@@ -45,9 +45,9 @@ Currently there are two trackers available:
 
 Currently there are two uploaders available:
 
-* **Insales uploader** will upload files to the specified Insales theme. Specify `Insup::Uploader::Insales` or `insales` in the `class` section of the uploader configuration. Insales uploader also requires `theme_id` to be specified. Working directory should include 3 subfolders *media*, *snippets* and *templates*. The same 3 folders should be specified in the `track` sectio of .insup file.
+* **Insales uploader** will upload files to the specified Insales theme. Specify `Insup::Uploader::InsalesUploader` or `insales` in the `class` section of the uploader configuration. Insales uploader also requires `theme_id` to be specified. Working directory should include 3 subfolders *media*, *snippets* and *templates*. The same 3 folders should be specified in the `track` sectio of .insup file.
 
-* **Dummy uploader** will only print its operations to the console without actually uploading anything. It can be used for testing the configuration. Use by specifying `dummy` or `Insup::Uploader::Dummy` in the `class` section.
+* **Dummy uploader** will only print its operations to the console without actually uploading anything. It can be used for testing the configuration. Use by specifying `dummy` or `Insup::Uploader::DummyUploader` in the `class` section.
 
 ### Operation modes
 
@@ -78,6 +78,11 @@ Upload changes
 ```bash
 insup commit
 ```
+You can also specify particlular files with the `commit` command:
+```bash
+insup commit [file1 [file2 [file3 [...]]]]
+```
+In this case **tracking info is ignored** and each file specified is treated as modified or deleted (if it doesn't actually exist).
 
 ### Other commands
 List all themes in the Insales shop if `insales` section is given in the .insup file:
@@ -85,6 +90,12 @@ List all themes in the Insales shop if `insales` section is given in the .insup
 insup insales list-themes
 ```
 
+Download all Insales theme files into the working directory:
+```bash
+insup insales download [-f] [-t theme-id]
+```
+Specify `-f` flag to overwrite any existing file. If no theme ID is specified Insup will download theme specified in the .insup file.
+
 List files under tracked locations:
 ```bash
 insup list-files [--all|--ignored]

data/bin/insup

@@ -21,6 +21,7 @@ pre do |global_options, command, options, args|
 end
 
 on_error do |ex|
+  puts ex.message
   Insup::Console.process_error(ex)
   false
 end
@@ -85,7 +86,7 @@ command :listen do |c|
   end
 end
 
-desc 'Tasks related to insales'
+desc 'Tasks related to Insales'
 command :insales do |c|
   c.default_command 'list-themes'
   c.desc 'List themes in the current Insales shop'
@@ -94,6 +95,15 @@ command :insales do |c|
       Insup::Console.insales_list_themes
     end
   end
+
+  c.desc 'Download theme files to current directory'
+  c.command 'download' do |sc|
+    sc.switch [:f, :force], desc: 'Overwrite existing files without prompt'
+    sc.flag [:t, :theme], desc: 'Insales theme id', default_value: nil
+    sc.action do |global_options, options, args|
+      Insup::Console.insales_download_theme(options[:force], options[:theme])
+    end
+  end
 end
 
 default_command :listen

data/insup.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.add_dependency 'colorize', '~> 0.7'
-  s.add_dependency 'gli', '~> 2.10'
+  s.add_dependency 'gli', '~> 2.11'
   s.add_dependency 'listen', '~> 2.7'
   s.add_dependency 'match_files', '~> 0.2'
   s.add_dependency 'activeresource', '~> 4.0'

data/insup.template

@@ -4,9 +4,15 @@ track:
   - snippets
   - templates
 
+# Tracker settings
+#   class: tracker class. Use 'git' or 'simple'
 tracker:
   class: git
 
+# Insales settings
+# subdomain: your Insales subdomain, e.g. my-shop.myinsales.ru
+# api_key: Insales API key for insup application
+# password: Insales API passeword for insup application
 insales:
   subdomain:
   api_key:
@@ -14,6 +20,7 @@ insales:
 
 # Uploader settings
 #   class: uploader class. Use 'insales' or 'dummy'
+#   theme_id: Insales theme ID
 uploader:
   class: insales
   theme_id:
@@ -30,14 +37,14 @@ ignore:
   - '*.log'
 
 # Logging settings
-#   file: Path to the log file relative to the working directory
-#   level: Log error level. Available options are 'unknown', 'debug', 'error', 'fatal', 'info',
-#          and 'warn'
-#   pattern: A pattern to for logger to use when writing messages. Available substitutions are:
-#            %{timestamp}, %{level} and %{message}
+#   file: path to the log file relative to the working directory. Omit this key to use STDERR instead
+#         of file.
+#   level: log error level. Available options are 'unknown', 'debug', 'error', 'fatal', 'info',
+#          and 'warn'.
+#   pattern: a pattern to for logger to use when writing messages. Available substitutions are:
+#            %{timestamp}, %{level}, %{message} and %{backtrace}.
 #
-
 log:
   file: 'log/insup.log'
   level: 'info'
-  pattern: "%{timestamp} - %{level}\t: %{message}\n"
+  pattern: "%{timestamp} - %{level}\t: %{message} %{backtrace}\n"

data/lib/insup.rb

@@ -20,7 +20,8 @@ class Insup
   def self.create_insup_file(dir = nil)
     dir ||= Dir.getwd
     template_file = File.join(File.dirname(File.expand_path(__FILE__)), '../insup.template')
-    FileUtils.cp(template_file, File.join(dir, '.insup'))
+    path = File.join(dir, '.insup')
+    FileUtils.cp(template_file, path) if !File.exist?(path)
   end
 
   def tracked_locations
@@ -58,7 +59,7 @@ class Insup
       klass = Insup::Uploader.find_uploader(uploader_conf['class']) || Object::const_get(uploader_conf['class'])
       klass.new(@settings)
     else
-      Uploader::Dummy.new(@settings)
+      Uploader::DummyUploader.new(@settings)
     end
   end
 
@@ -81,10 +82,13 @@ class Insup
 
   def listen
     @listener = Listener.new(@base, @settings)
-
     @listener.listen do |changes|
-      changes.each do |change|
-        uploader.process_file(change)
+      begin
+        changes.each do |change|
+          uploader.process_file(change)
+        end
+      rescue Exceptions::RecoverableUploaderError => ex
+        logger.error(ex)
       end
     end
   end

data/lib/insup/console.rb

@@ -1,5 +1,6 @@
 require 'colorize'
 require 'fileutils'
+require 'io/console'
 require_relative '../insup'
 
 module Insup::Console
@@ -71,6 +72,25 @@ module Insup::Console
     end
   end
 
+  def self.insales_download_theme(force = false, theme_id = nil)
+    theme_id ||= @settings.uploader['theme_id']
+    puts "Downloading theme #{theme_id}"
+
+    @insup.insales.download_theme(theme_id, Dir.getwd) do |asset, exists|
+      if exists && !force
+        puts "#{asset.path} already exists"
+        false
+      else
+        if exists
+          puts "Overwriting #{asset.path}"
+        else
+          puts "Downloading #{asset.path}"
+        end
+        true
+      end
+    end
+  end
+
   def self.status
     @insup.changes.each do |x|
       case x.state
@@ -101,7 +121,7 @@ module Insup::Console
     Kernel.trap( "INT" ) { exit_requested = true }
 
     while !exit_requested do
-      sleep 0.1
+      sleep(0.1)
     end
 
     puts 'Stopping listener...'

data/lib/insup/exceptions.rb

@@ -1,5 +1,7 @@
 module Insup::Exceptions
   InsupError = Class.new(StandardError)
   UploaderError = Class.new(InsupError)
+  RecoverableUploaderError = Class.new(UploaderError)
+  FatalUploaderError = Class.new(UploaderError)
   NotAGitRepositoryError = Class.new(InsupError)
 end

data/lib/insup/insales.rb

@@ -1,5 +1,7 @@
-class Insup::Insales
+require 'net/http'
+require 'json'
 
+class Insup::Insales
   def initialize(settings)
     @settings = settings
   end
@@ -27,9 +29,25 @@ class Insup::Insales
     @settings.insales
   end
 
-  def print_config
-
+  def download_theme(theme_id, dir)
+    configure_api
+    theme = Theme.find(theme_id)
+
+    theme.assets.each do |asset|
+      next if !asset.dirname
+      path = File.join(dir, asset.path)
+      exists = File.exist?(path)
+      write = !exists
+      write = yield(asset, exists) if block_given?
+      
+      if write
+        File.delete(path) if exists
+        Dir.mkdir(File.dirname(path)) if !Dir.exist?(File.dirname(path))
+        File.open(path, 'wb'){|f| f.write(asset.data)}
+      end
+    end
   end
+
 end
 
 require 'active_resource'

data/lib/insup/insales/asset.rb

@@ -1,5 +1,68 @@
+require 'base64'
+require 'net/http'
 class Insup::Insales::Asset < Insup::Insales::Base
   belongs_to :theme, class_name: 'Insup::Insales::Theme'
 
   self.prefix = '/admin/themes/:theme_id/'
+
+  TYPE_MAP = {
+    'media' => 'Asset::Media',
+    'snippets' => 'Asset::Snippet',
+    'templates' => 'Asset::Template',
+    'config' => 'Asset::Configuration' 
+  }.freeze
+
+  def filename
+    fname_rex = /\..*+$/
+    if name.match(fname_rex)
+      name
+    elsif human_readable_name.match(fname_rex)
+      human_readable_name
+    else
+      nil
+    end
+  end
+
+  def is_image?
+    content_type =~ /image/ || content_type =~ /octet-stream/ || content_type =~ /flash/
+  end
+
+  def self.get_type(path)
+    TYPE_MAP.each do |k,v|
+      return v if path.start_with?("#{k}/")
+    end
+  end
+
+  def dirname
+    TYPE_MAP.invert[type]
+  end
+
+  def path 
+    "#{dirname}/#{filename}"
+  end
+
+  def data
+    if respond_to? (:asset_url)
+      download_data_from_url
+    elsif ['Asset::Snippet', 'Asset::Template'].include?(type)
+      w = get_full
+      w.content if w.respond_to?(:content)
+    end
+  end
+
+  def theme_id
+    prefix_options[:theme_id]
+  end
+
+  def get_full
+    self.class.find(id, params: {theme_id: theme_id})
+  end
+
+  def url
+    "#{self.class.site}#{self.asset_url}"
+  end
+
+  def download_data_from_url
+    Net::HTTP.get(URI(self.url))
+  end
 end

data/lib/insup/listener.rb

@@ -27,35 +27,14 @@ class Listener
 
       res = []
 
-      flags.each do |f, flags|
+      flags.each do |f, flag|
         pn = Pathname.new(f)
         basepn = Pathname.new(@base)
         file = pn.relative_path_from(basepn).to_s
-
         next if ignore_matcher.matched?(file)
-
-        case flags
-        when 1
-          res << Insup::TrackedFile.new(file, Insup::TrackedFile::DELETED)
-        when 2
-          res << Insup::TrackedFile.new(file, Insup::TrackedFile::MODIFIED)
-        when 3
-          res << Insup::TrackedFile.new(file, Insup::TrackedFile::DELETED)
-        when 4
-          res << Insup::TrackedFile.new(file, Insup::TrackedFile::NEW)
-        when 5
-          if File.exist?(file)
-            res << Insup::TrackedFile.new(file, Insup::TrackedFile::UNSURE)
-          end
-        when 6
-          res << Insup::TrackedFile.new(file, Insup::TrackedFile::NEW)
-        when 7
-          if File.exist?(file)
-            res << Insup::TrackedFile.new(file, Insup::TrackedFile::UNSURE)
-          end
-        end
+        tracked_file = create_tracked_file(flag, file)
+        res << tracked_file if !tracked_file.nil?
       end
-
       yield res
     end
 
@@ -70,6 +49,30 @@ class Listener
 
   protected
 
+  def create_tracked_file(flags, file)
+    case flags
+      when 1
+        Insup::TrackedFile.new(file, Insup::TrackedFile::DELETED)
+      when 2
+        Insup::TrackedFile.new(file, Insup::TrackedFile::MODIFIED)
+      when 3
+        Insup::TrackedFile.new(file, Insup::TrackedFile::DELETED)
+      when 4
+        Insup::TrackedFile.new(file, Insup::TrackedFile::NEW)
+      when 5
+        if File.exist?(file)
+          Insup::TrackedFile.new(file, Insup::TrackedFile::UNSURE)
+        end
+      when 6
+        Insup::TrackedFile.new(file, Insup::TrackedFile::NEW)
+      when 7
+        if File.exist?(file)
+          Insup::TrackedFile.new(file, Insup::TrackedFile::UNSURE)
+        end
+      end
+    
+  end
+
   def ignore_matcher
     @ignore_matcher ||= ::MatchFiles.git(@base, ignore_patterns)
   end

data/lib/insup/tracker/git_tracker.rb

@@ -2,10 +2,9 @@ require_relative('../git')
 
 # Git tracker: tracks files by evaluating changes in Git repo
 class Insup::Tracker::GitTracker < Insup::Tracker
-
   tracker :git
 
-  def initialize config = nil
+  def initialize(base, config)
     super
     @git = ::Insup::Git.new(@path)
   end

data/lib/insup/uploader/insales_uploader.rb

@@ -2,18 +2,15 @@ require 'base64'
 require_relative '../insales'
 
 class Insup::Uploader::InsalesUploader < Insup::Uploader
-
   uploader :insales
 
-  InsalesUploaderError = Class.new(Insup::Exceptions::UploaderError)
-
   def initialize(settings)
     super
     @insales = Insup::Insales.new(settings)
     @insales.configure_api
 
     if !theme
-      raise Insup::Exceptions::UploaderError, "Theme #{theme_id} is not found in the Insales shop"
+      fail Insup::Exceptions::FatalUploaderError, "Theme #{theme_id} is not found in the Insales shop"
     end
 
     assets_list(true)
@@ -40,10 +37,13 @@ class Insup::Uploader::InsalesUploader < Insup::Uploader
 
     changed
     notify_observers(CREATING_FILE, file)
-    asset_type = get_asset_type(file.path)
+    asset_type = ::Insup::Insales::Asset.get_type(file.path)
 
     if !asset_type
-      raise InsalesUploaderError, "Cannot determine asset type for file #{file.path}"
+      msg = "Cannot determine asset type for file #{file.path}"
+      changed
+      notify_observers(ERROR, file, msg)
+      raise Insup::Exceptions::RecoverableUploaderError, msg
     end
 
     file_contents = File.read(file.path)
@@ -60,10 +60,16 @@ class Insup::Uploader::InsalesUploader < Insup::Uploader
       hash[:attachment] = Base64.encode64(file_contents)
     end
 
-    asset = ::Insup::Insales::Asset.new(hash)
-    assets_list << asset
-    changed
-    notify_observers(CREATED_FILE, file)
+    begin
+      asset = ::Insup::Insales::Asset.create(hash)
+      assets_list << asset
+      changed
+      notify_observers(CREATED_FILE, file)
+    rescue ActiveResource::ServerError => ex
+      changed
+      notify_observers(ERROR, file, ex.message)
+      raise Insup::Exceptions::RecoverableUploaderError, "Server error occured when creating file #{file.path}"
+    end
   end
 
   def upload_modified_file(file)
@@ -76,48 +82,57 @@ class Insup::Uploader::InsalesUploader < Insup::Uploader
 
     changed
     notify_observers(MODIFYING_FILE, file)
-
     file_contents = File.read(file.path)
 
     if asset.content_type.start_with? 'text/'
-      res = asset.update_attribute(:content, file_contents)
-      if !res
-        process_error(asset, file)
+      begin
+        res = asset.update_attribute(:content, file_contents)
+
+        if !res
+          process_error(asset, file)
+          return
+        end
+
+        changed
+        notify_observers(MODIFIED_FILE, file)
+      rescue ActiveResource::ServerError => ex
+        changed
+        notify_observers(ERROR, file, ex.message)
+        raise Insup::Exceptions::RecoverableUploaderError, "Server error occured when updating file #{file.path}"
       end
     else
       remove_file(file)
       upload_new_file(file)
     end
-
-    changed
-    notify_observers(MODIFIED_FILE, file)
   end
 
   def remove_file(file)
     asset = find_asset(file)
-
+    
     if !asset
-      raise InsalesUploaderError, "Cannot find remote counterpart for file #{file.path}"
+      msg = "Cannot find remote counterpart for file #{file.path}"
+      changed
+      notify_observers(ERROR, file, msg)
+      raise Insup::Exceptions::RecoverableUploaderError, "Cannot find remote counterpart for file #{file.path}"
     end
 
     changed
     notify_observers(DELETING_FILE, file)
 
-    if pd=asset.destroy
-      assets_list.delete(asset)
+    begin
+      if asset.destroy
+        assets_list.delete(asset)
+        changed
+        notify_observers(DELETED_FILE, file)
+      end
+    rescue ActiveResource::ServerError => ex
+      changed
+      notify_observers(ERROR, file, ex.message)
+      raise Insup::Exceptions::RecoverableUploaderError, "Server error occured when deleting file #{file.path}"
     end
-
-    changed
-    notify_observers(DELETED_FILE, file)
   end
 
 private
-  ASSET_TYPE_MAP = {
-    'media/' => 'Asset::Media',
-    'snippets/' => 'Asset::Snippet',
-    'templates/' => 'Asset::Template'
-  }.freeze
-
   def process_error(entity, file)
     changed
     entity.errors.full_messages.each do |err|
@@ -126,19 +141,6 @@ private
     end
   end
 
-  def get_asset_type path
-    res = nil
-
-    ASSET_TYPE_MAP.each do |k,v|
-      if path.start_with? k
-        res = v
-        break
-      end
-    end
-
-    res
-  end
-
   def theme
     @theme ||= themes[theme_id]
   end
@@ -151,15 +153,18 @@ private
     @themes ||= Hash[@insales.themes.map{|t| [t.id, t]}]
   end
 
-  def find_asset file
-    asset_type = get_asset_type(file.path)
-
-    if(!asset_type)
-      raise InsalesUploaderError, "Cannot determine asset type for file #{file.path}"
+  def find_asset(file)
+    asset_type = ::Insup::Insales::Asset.get_type(file.path)
+    
+    if !asset_type
+      msg = "Cannot determine asset type for file #{file.path}"
+      changed
+      notify_observers(ERROR, file, msg)
+      raise Insup::Exceptions::RecoverableUploaderError, "Cannot determine asset type for file #{file.path}"
     end
 
-    files = assets_list.select  do |el|
-      el.type == asset_type && (el.human_readable_name == file.file_name || el.name == file.file_name)
+    files = assets_list.select do |el|
+      el.type == asset_type && el.filename == file.file_name
     end
 
     if files && !files.empty?

data/lib/insup/version.rb

@@ -1,3 +1,3 @@
 class Insup
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/spec/lib/insup/console/upload_observer_spec.rb

@@ -1,9 +1,9 @@
 require_relative '../../../spec_helper'
 
-describe 'Insup::Console::UploadObserver' do
+describe Insup::Console::UploadObserver do
 
   it 'should handle all types of events' do
-    @observer = Insup::Console::UploadObserver.new
+    @observer = described_class.new
 
     [Insup::Uploader::CREATING_FILE,
     Insup::Uploader::CREATED_FILE,
@@ -12,7 +12,9 @@ describe 'Insup::Console::UploadObserver' do
     Insup::Uploader::DELETING_FILE,
     Insup::Uploader::DELETED_FILE,
     Insup::Uploader::BATCH_UPLOADING_FILES,
-    Insup::Uploader::BATCH_UPLOADED_FILES].each do |event|
+    Insup::Uploader::BATCH_UPLOADED_FILES,
+    Insup::Uploader::ERROR
+    ].each do |event|
       expect {@observer.update(event, Insup::TrackedFile.new('path/to.file'))}.not_to raise_error
     end
   end

data/spec/lib/insup/git_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
-describe 'Insup::Git' do
+describe Insup::Git do
   it 'should get status' do
-    expect{git = Insup::Git.new(Dir.getwd)}.not_to raise_error
+    expect{git = described_class.new(Dir.getwd)}.not_to raise_error
   end
 end

data/spec/lib/insup/settings_spec.rb

@@ -1,8 +1,8 @@
 require_relative '../../spec_helper'
 
-describe 'Insup::Settings' do
+describe Insup::Settings do
   before(:each) do
-    @settings = Insup::Settings.new('spec/support/.insup')
+    @settings = described_class.new('spec/support/.insup')
   end
 
   it 'should have correct tracked locations' do

data/spec/lib/insup/tracker_spec.rb

@@ -1,9 +1,9 @@
 require_relative '../../spec_helper'
 
-describe 'Insup::Tracker' do
+describe Insup::Tracker do
 
   before(:each) do
-    @tracker = Insup::Tracker.new()
+    @tracker = described_class.new()
   end
 
 end

data/spec/lib/insup/uploader/insales_uploader_spec.rb

@@ -1,5 +1,5 @@
 require_relative '../../../spec_helper'
 
-describe 'Insup::Uploader::InsalesUploader' do
+describe Insup::Uploader::InsalesUploader do
 
 end

data/spec/lib/insup_spec.rb

@@ -1,5 +1,5 @@
 require_relative '../spec_helper'
 
-describe 'Insup' do
+describe Insup do
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insup
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - HttpLab
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement