insup 0.1.2 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865c49f6dd236ccef3027dc04084c735b87f525a
-  data.tar.gz: 97b3f43e5fa341d031b8f05e8fabfa26bd51f862
+  metadata.gz: 6ddabfbd03d3ec5598cf705493a8dbd48aeb1d3d
+  data.tar.gz: 511d852bd1c4cd25bb6214b22fff66b3f06655da
 SHA512:
-  metadata.gz: e601f6a59cd8c163c34bc9e1448417c35db3abab1ae781f1753f40120161348a339d6299b8c736f63321c9b5e457a847ad75f6276ef1a5d76a86546d4fbf7382
-  data.tar.gz: 3e7e51c70057e53e8d62d6f5b0b6e9d286d1f94105ca07b7a69e4f568dc15f67958a51f1b38b97db2225cfae8dc646331a8524aa92670ca4db771f3e7fe6ba0d
+  metadata.gz: 9ebc75e74472e577ac81b3cec28c882a3b3b23f294f540c8d8cb60b793728271b45a14bd04046be164ec899b635c7c95408d849af6babdd4d1a3856b5351b51b
+  data.tar.gz: 3cda1702f037ffc0efbccbeb73d353f37683b78b030b821ca64a3b40c32ce03afca0072a5413b8e468e7cb493c00d5c775a81956e0e09129cde754423ae30a77

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.1.2

data/Gemfile.lock

@@ -4,21 +4,21 @@ PATH
     insup (0.1.2)
       activeresource (~> 4.0)
       colorize (~> 0.7)
+      gli (~> 2.10)
       listen (~> 2.7)
-      match_files (~> 0.1)
-      trollop (~> 2.0)
+      match_files (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
       builder (~> 3.1)
     activeresource (4.0.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.1.0)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -27,10 +27,7 @@ GEM
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    colorize (0.7.2)
+    colorize (0.7.3)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -40,18 +37,17 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.3)
     ffi (1.9.3)
+    gli (2.10.0)
     i18n (0.6.9)
     json (1.8.1)
-    listen (2.7.2)
+    listen (2.7.6)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    match_files (0.1)
-    mime-types (2.2)
-    minitest (5.3.3)
-    multi_json (1.9.3)
-    nio4r (1.0.0)
+    match_files (0.2)
+    mime-types (2.3)
+    minitest (5.3.4)
+    multi_json (1.10.1)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     rb-fsevent (0.9.4)
@@ -59,14 +55,18 @@ GEM
       ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    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-support (~> 3.0.0)
+    rspec-expectations (3.0.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -75,11 +75,10 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     timers (1.1.0)
-    tins (1.1.0)
-    trollop (2.0)
-    tzinfo (1.1.0)
+    tins (1.3.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 HttpLab
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -29,9 +29,10 @@ Open **.insup** file with your favourite text editor and modify the configuratio
 
 * **track** section is an array of directories which you want to track for changes. Specify locations relative to the working directory
 * **ignore** section specifies an array of patterns that are used to ignore files. Files that match ignore patterns will be neither tracked nor uploaded. The patterns must be specified in Git ignore format relative to the working directory.
-* **tracker** section specifies the tracker to use as well as its configuration. The tracker class is specified by the `class` option.
-* **uploader** section specifies the uploader to use as well as its configuration. The uploader class is specified by the `class` option.
+* [**tracker**](#trackers) section specifies the tracker to use as well as its configuration. The tracker class is specified by the `class` option.
+* [**uploader**](#uploaders) section specifies the uploader to use as well as its configuration. The uploader class is specified by the `class` option.
 * **insales** secion holds information for connecting to Insales shop. To use insales features you should specify `subdomain`, `api_key` and `password` parameters.
+* **log** section sets logging parameters. Use `file` to specify a log file path, `level` to set log level (`unknown`, `debug`, `error`, `fatal`, `info`, `unknown` and `warn`), and `pattern` to specify log message pattern using `%{timestamp}`, `%{level}`, `%{message}`, and `%{backtrace}` substitutions.
 
 #### Trackers
 
@@ -58,11 +59,14 @@ Activate listen mode by typing
 ```bash
 insup listen
 ```
+or just
+```bash
+insup
+```
 in your working directory.
 
 
 #### Track mode
-
 In this mode you can periodically check for changes and upload changed files to the remote storage. Tracker specified in the .insup file is used to detect changes.
 
 Print working directory status accroding to the selected tracker
@@ -72,12 +76,10 @@ insup status
 
 Upload changes
 ```bash
-insup commit [file1 [file2 [file3 [...]]]]
+insup commit
 ```
-Call `commit` command with the file list to upload only files specified.
 
 ### Other commands
-
 List all themes in the Insales shop if `insales` section is given in the .insup file:
 ```bash
 insup insales list-themes
@@ -88,3 +90,13 @@ List files under tracked locations:
 insup list-files [--all|--ignored]
 ```
 Use `--all` option to list *all* files, and `--ignored` to list only ignored files. Calling this command without options will result in a list of tracked files only.
+
+#### Getting help
+To see a full list of commands available, type:
+```bash
+insup --help
+```
+To see help message on the specific command, type:
+```bash
+insup <command> --help
+```

data/bin/insup

@@ -1,67 +1,101 @@
 #!/usr/bin/env ruby
 
-require 'trollop'
-
+require 'gli'
 require_relative '../lib/insup/version'
-require_relative '../lib/insup.rb'
-
-SUB_COMMANDS = %w(init status config commit list-locations list-files listen insales)
-
-global_opts = Trollop::options do
-  version "insup #{Insup::VERSION} (c) 2014 nuinuhin@gmail.com"
-  banner <<-EOS
-Usage:
-       insup status
-       insup commit [file1, [file2, [...]]]
-       insup config
-       insup list-files
-       insup listen
-       insup init
-       insup list-locations
-       insup insales list-themes
-EOS
-  stop_on SUB_COMMANDS
+require_relative '../lib/insup/console'
+
+include GLI::App
+
+program_desc 'Insup uploader'
+version Insup::VERSION
+flag [:c,:config], default_value: '.insup'
+switch [:v,:verbose], desc: 'Be verbose'
+switch [:d, :debug], desc: 'Dump debug information upon error'
+
+pre do |global_options, command, options, args|
+  settings_file = global_options[:config]
+  verbose = global_options[:verbose]
+  debug = global_options[:debug]
+  ENV['GLI_DEBUG'] = 'true' if debug
+  Insup::Console.start(settings_file, verbose, debug)
 end
 
-cmd = ARGV.shift
+on_error do |ex|
+  Insup::Console.process_error(ex)
+  false
+end
 
-if cmd.nil?
-  raise Trollop::HelpNeeded
+desc 'Initialize the directory with insup file'
+arg_name 'directory', [:optional]
+command :init do |c|
+  c.action do |global_options, options, args|
+    Insup::Console.init(args[0])
+  end
 end
 
-if(!SUB_COMMANDS.include? cmd)
-  Trollop::die "unknown subcommand #{cmd.inspect}"
+desc 'Show current status of working directory according to the selected tracker'
+command :status do |c|
+  c.action do |global_options, options, args|
+    Insup::Console.status
+  end
+end
+
+desc 'Print current config and exit'
+command :config do |c|
+  c.action do |global_options, options, args|
+    Insup::Console.print_config
+  end
+end
+
+desc 'Show tracked locations'
+command 'list-locations' do |c|
+  c.action do |global_options, options, args|
+    Insup::Console.list_locations
+  end
 end
 
-begin
-  case cmd
-  when 'status'
-    Insup.status
-  when 'config'
-    Insup.print_config
-  when 'list-locations'
-    Insup.list_locations
-  when 'list-files'
-    if ARGV.include?('--all')
-      Insup.list_files(mode: :all)
-    elsif ARGV.include?('--ignored')
-      Insup.list_files(mode: :ignored)
+desc 'List files under tracked locations'
+command 'list-files' do |c|
+  c.switch [:a, :all], desc: 'List all files, including ignored ones', negatable: false
+  c.switch [:i, :ignored], desc: 'List only ignored files', negatable: false
+
+  c.action do |global_options, options, args|
+    if options[:all]
+      Insup::Console.list_files(mode: :all)
+    elsif options[:ignored]
+      Insup::Console.list_files(mode: :ignored)
     else
-      Insup.list_files
+      Insup::Console.list_files
     end
-  when 'commit'
-    Insup.commit ARGV.map{|f| Insup::TrackedFile.new(f,Insup::TrackedFile::MODIFIED)}
-  when 'listen'
-    Insup.listen
-  when 'init'
-    Insup.init(ARGV[0])
-  when 'insales'
-    cmd = ARGV.shift
-    case cmd
-    when 'list-themes'
-      Insup::Insales.list_themes
+  end
+end
+
+desc 'Apply changes to the remote storage'
+arg_name 'file', [:optional, :multiple]
+command :commit do |c|
+  c.action do |global_options, options, args|
+    Insup::Console.commit(args)
+  end
+end
+
+desc 'Initialize listen mode'
+command :listen do |c|
+  c.action do |global_options, options, args|
+    Insup::Console.listen
+  end
+end
+
+desc 'Tasks related to insales'
+command :insales do |c|
+  c.default_command 'list-themes'
+  c.desc 'List themes in the current Insales shop'
+  c.command 'list-themes' do |sc|
+    sc.action do |global_options, options, args|
+      Insup::Console.insales_list_themes
     end
   end
-rescue => ex
-  puts ex.message
 end
+
+default_command :listen
+
+exit run(ARGV)

data/insup.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.add_dependency 'colorize', '~> 0.7'
-  s.add_dependency 'trollop', '~> 2.0'
+  s.add_dependency 'gli', '~> 2.10'
   s.add_dependency 'listen', '~> 2.7'
-  s.add_dependency 'match_files', '~> 0.1'
+  s.add_dependency 'match_files', '~> 0.2'
   s.add_dependency 'activeresource', '~> 4.0'
 
   s.files = `git ls-files`.split("\n")

data/insup.template

@@ -0,0 +1,43 @@
+# Tracked locations. List all subdirectories of the working directory you want Insup to track
+track:
+  - media
+  - snippets
+  - templates
+
+tracker:
+  class: git
+
+insales:
+  subdomain:
+  api_key:
+  password:
+
+# Uploader settings
+#   class: uploader class. Use 'insales' or 'dummy'
+uploader:
+  class: insales
+  theme_id:
+
+# Ignore patterns
+# Insup ignore patterns follow the same rules as Git ignore. Remember that the patterns
+# are considered to be relative to the working directory, not to the tracked locations.
+ignore:
+  - '*.swp'
+  - '*.swx'
+  - '.*'
+  - 'thumbs.db'
+  - '.DS_Store'
+  - '*.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}
+#
+
+log:
+  file: 'log/insup.log'
+  level: 'info'
+  pattern: "%{timestamp} - %{level}\t: %{message}\n"

data/lib/insup/console/upload_observer.rb

@@ -0,0 +1,20 @@
+require_relative '../uploader'
+require 'colorize'
+
+class Insup::Console::UploadObserver
+  def update(event, *args)
+    file = args[0]
+
+    case event
+    when Insup::Uploader::CREATING_FILE
+      puts "Creating file #{file.path}...".green
+    when Insup::Uploader::MODIFYING_FILE
+      puts "Uploading file #{file.path}...".yellow
+    when Insup::Uploader::DELETING_FILE
+      puts "Deleting file #{file.path}...".red
+    when Insup::Uploader::ERROR
+      message = args[1]
+      puts "Error in #{file.path}: #{message}".red
+    end
+  end
+end

data/lib/insup/console.rb

@@ -0,0 +1,137 @@
+require 'colorize'
+require 'fileutils'
+require_relative '../insup'
+
+module Insup::Console
+
+  def self.start(settings_file = nil, verbose = false, debug = false)
+    settings_file ||= '.insup'
+    @settings = Insup::Settings.new(settings_file)
+    @insup = Insup.new(Dir.getwd, @settings)
+    @verbose = verbose
+    @debug = debug
+    self.init_log(@settings)
+    true
+  end
+
+  def self.init_log(settings)
+    if settings.log_file.nil? || settings.log_file.empty?
+      @logger = Logger.new($stdout)
+    else
+      log_dir = File.dirname(settings.log_file)
+      FileUtils.mkdir_p(log_dir) if !Dir.exist?(log_dir)
+      @logger = Logger.new(settings.log_file)
+    end
+
+    @logger.level = @debug ? Logger::DEBUG : settings.log_level
+    @logger.formatter = proc do |severity, datetime, progname, msg|
+
+      format_string = settings.log_pattern
+      values_hash = {
+        level: severity,
+        timestamp: datetime
+      }
+
+      if msg.is_a? Exception
+        values_hash[:message] = msg.message
+        values_hash[:backtrace] = "\n#{msg.backtrace.join("\n")}"
+      else
+        values_hash[:message] = msg.to_s
+        values_hash[:backtrace] = nil
+      end
+
+      format_string % values_hash
+    end
+
+    Insup.logger = @logger
+  end
+
+  def self.init(directory = nil)
+    directory ||= Dir.getwd
+    Insup.create_insup_file(directory)
+  end
+
+  def self.list_locations
+    @insup.tracked_locations.each do |loc|
+      puts loc
+    end
+  end
+
+  def self.list_files(options = {})
+    @insup.files(options).each do |f|
+      puts f
+    end
+  end
+
+  def self.insales_list_themes
+    theme_id = @settings.uploader['theme_id']
+    @insup.insales.themes.each do |theme|
+      prefix = theme.id == theme_id ? '=>' : '  '
+      puts "#{prefix} #{theme.id}\t#{theme.title}"
+    end
+  end
+
+  def self.status
+    @insup.changes.each do |x|
+      case x.state
+      when Insup::TrackedFile::NEW
+        puts "New:      #{x.path}".green
+      when Insup::TrackedFile::MODIFIED
+        puts "Modified: #{x.path}".yellow
+      when Insup::TrackedFile::DELETED
+        puts "Deleted:  #{x.path}".red
+      end
+    end
+  end
+
+  def self.print_config
+    puts "Tracker: #{@settings.tracker['class']}"
+    puts "Uploader: #{@settings.uploader['class']}"
+    puts 'Tracked locations:'
+    puts @settings.tracked_locations.map{|loc| "\t#{loc}"}
+    puts 'Ignore patterns:'
+    puts @settings.ignore_patterns.map{|ip| "\t#{ip}"}
+  end
+
+  def self.listen
+    @insup.uploader.add_observer(Insup::Console::UploadObserver.new)
+    puts 'Listening...'
+    @insup.listen
+    exit_requested = false
+    Kernel.trap( "INT" ) { exit_requested = true }
+
+    while !exit_requested do
+      sleep 0.1
+    end
+
+    puts 'Stopping listener...'
+    @insup.stop_listening
+    puts 'Terminated by user'
+  end
+
+  def self.commit(args)
+    @insup.uploader.add_observer(Insup::Console::UploadObserver.new)
+    @insup.commit(args)
+  end
+
+  def self.process_error(exception)
+    if exception.is_a? Insup::Exceptions::UploaderError
+      $stderr.puts "UploaderError: #{exception.message}".red
+    else
+      $stderr.puts "Error: #{exception.message}".red
+    end
+
+    if @debug
+      $stderr.puts exception.backtrace
+    end
+
+    begin
+      @logger.error(exception) if @logger
+    rescue
+      $stderr.puts "Unable to log error because the logger is not properly configured"
+    end
+  end
+
+end
+
+require_relative 'console/upload_observer'

data/lib/insup/insales.rb

@@ -1,30 +1,35 @@
-module Insup::Insales
+class Insup::Insales
 
-  def self.configure_api
-    @config = Insup::Settings.instance.insales;
+  def initialize(settings)
+    @settings = settings
+  end
+
+  def self.logger=(val)
+    ActiveResource::Base.logger = val
+  end
 
-    return false if @config.nil?
+  def self.logger
+    ActiveResource::Base.logger
+  end
 
+  def configure_api
     if !@has_api
-      active_resource_logger = Logger.new('log/active_resource.log', 'daily')
-      active_resource_logger.level = Logger::DEBUG
-      ActiveResource::Base.logger = active_resource_logger
-      @has_api = ::Insup::Insales::Base.configure(@config['api_key'], @config['subdomain'], @config['password'])
+      @has_api = ::Insup::Insales::Base.configure(config['api_key'], config['subdomain'], config['password'])
     end
   end
 
-  def self.list_themes
+  def themes
     configure_api
-    themes = Theme.all
-    themes.each do |theme|
-      puts "#{theme.id}\t#{theme.title}"
-    end
+    Theme.all
+  end
+
+  def config
+    @settings.insales
   end
 
   def print_config
 
   end
-
 end
 
 require 'active_resource'

data/lib/insup/listener.rb

@@ -2,8 +2,9 @@ require 'listen'
 
 class Listener
 
-  def initialize(base)
+  def initialize(base, settings)
     @base = base
+    @settings = settings
   end
 
   def listen(&block)
@@ -74,11 +75,11 @@ class Listener
   end
 
   def tracked_locations
-    @track = ::Insup::Settings.instance.tracked_locations
+    @track = @settings.tracked_locations
   end
 
   def ignore_patterns
-    @ignore_patterns ||= ::Insup::Settings.instance.ignore_patterns
+    @ignore_patterns = @settings.ignore_patterns
   end
 
 end

data/lib/insup/settings.rb

@@ -1,15 +1,16 @@
 require 'yaml'
+require 'logger'
 
 class Insup::Settings
   attr_reader :settings
 
-  def self.instance
-    @instance ||= new()
-  end
-
   def initialize(filename = '.insup')
-    insupfile = IO.read(filename)
-    @settings = YAML.load(insupfile)
+    if File.exist?(filename)
+      insupfile = IO.read(filename)
+      @settings = YAML.load(insupfile)
+    else
+      @settings = {}
+    end
   end
 
   def tracked_locations
@@ -17,23 +18,47 @@ class Insup::Settings
   end
 
   def uploader
-    return settings['uploader']
+    return @settings['uploader']
   end
 
   def tracker
-    return settings['tracker']
+    return @settings['tracker']
   end
 
   def ignore_patterns
-    return settings['ignore'] || []
+    return @settings['ignore'] || []
   end
 
   def insales
-    return settings['insales']
+    return @settings['insales']
   end
 
   def save(filename)
     File.write(filename, @settings.to_yaml)
   end
 
+  def log
+    @settings['log'] || {}
+  end
+
+  def log_level
+    level = log['level'] || 'info'
+    level = "Logger::#{level.upcase}"
+    Kernel.const_get(level)
+  end
+
+  def log_pattern
+    log['pattern'] || "%{message}\n"
+  end
+
+  def log_file
+    log['file']
+  end
+
+  def save(filename)
+    File.open(filename, 'w') do |f|
+      f.write(@settings.to_yaml)
+    end
+  end
+
 end

data/lib/insup/tracker.rb

@@ -1,4 +1,4 @@
-require('match_files')
+require 'match_files'
 class Insup::Tracker
 
   def self.tracker(tracker_alias)
@@ -10,12 +10,12 @@ class Insup::Tracker
     @@trackers[tracker_alias.to_sym]
   end
 
-  def initialize(config = nil)
+  def initialize(base, config)
     @config = config
-    @path = Dir.getwd
+    @path = base
   end
 
-  # Lists ALL files in the tracked locations whether they are ignored or not
+  # Lists all files in the tracked locations whether they are ignored or not
   def all_files
     locations = tracked_locations
     locations.map do |loc|
@@ -25,12 +25,12 @@ class Insup::Tracker
     end.flatten
   end
 
-  # Lists ALL tracked files in the tracked locations i. e. all files but ignored
+  # Lists all tracked files in the tracked locations i. e. all files but ignored
   def tracked_files
     all_files.reject{|f| ignore_matcher.matched?(f)}
   end
 
-  # Lists ALL tracked files in the tracked locations i. e. all files but ignored
+  # Lists all tracked files in the tracked locations i. e. all files but ignored
   def ignored_files
     all_files.select{|f| ignore_matcher.matched?(f)}
   end
@@ -52,11 +52,11 @@ class Insup::Tracker
   end
 
   def tracked_locations
-    @track = ::Insup::Settings.instance.tracked_locations
+    @track = @config.tracked_locations
   end
 
   def ignore_patterns
-    @ignore_patterns ||= ::Insup::Settings.instance.ignore_patterns
+    @ignore_patterns ||= @config.ignore_patterns
   end
 
 end

data/lib/insup/uploader/dummy_uploader.rb

@@ -7,18 +7,30 @@ class Insup::Uploader::DummyUploader < Insup::Uploader
   def upload_file(file)
     case file.state
     when Insup::TrackedFile::NEW
-      puts "Creating file #{file.path}".green
+      changed
+      notify_observers(CREATING_FILE, file)
+      changed
+      notify_observers(CREATED_FILE, file)
     when Insup::TrackedFile::MODIFIED, Insup::TrackedFile::UNSURE
-      puts "Uploading file #{file.path}".yellow
+      changed
+      notify_observers(MODIFYING_FILE, file)
+      changed
+      notify_observers(MODIFIED_FILE, file)
     end
   end
 
   def remove_file file
-    puts "Deleting file #{file.path}".red
+    changed
+    notify_observers(DELETING_FILE, file)
+    changed
+    notify_observers(DELETED_FILE, file)
   end
 
   def batch_upload(files)
-    puts "Batch uploading #{files.count} files"
+    changed
+    notify_observers(BATCH_UPLOADING_FILE, file)
+    changed
+    notify_observers(BATCH_UPLOADED_FILE, file)
   end
 
 end

data/lib/insup/uploader/insales_uploader.rb

@@ -7,9 +7,15 @@ class Insup::Uploader::InsalesUploader < Insup::Uploader
 
   InsalesUploaderError = Class.new(Insup::Exceptions::UploaderError)
 
-  def initialize(config)
+  def initialize(settings)
     super
-    Insup::Insales.configure_api
+    @insales = Insup::Insales.new(settings)
+    @insales.configure_api
+
+    if !theme
+      raise Insup::Exceptions::UploaderError, "Theme #{theme_id} is not found in the Insales shop"
+    end
+
     assets_list(true)
   end
 
@@ -32,23 +38,32 @@ class Insup::Uploader::InsalesUploader < Insup::Uploader
       return
     end
 
-    puts "Creating #{file.path}".green
+    changed
+    notify_observers(CREATING_FILE, file)
     asset_type = get_asset_type(file.path)
 
-    if(!asset_type)
+    if !asset_type
       raise InsalesUploaderError, "Cannot determine asset type for file #{file.path}"
     end
 
     file_contents = File.read(file.path)
 
-    asset = ::Insup::Insales::Asset.create({
+    hash = {
       name: file.file_name,
-      attachment: Base64.encode64(file_contents),
-      theme_id: @config['theme_id'],
+      theme_id: @config.uploader['theme_id'],
       type: asset_type
-    })
+    }
+
+    if ['Asset::Snippet', 'Asset::Template'].include?(asset_type)
+      hash[:content] = file_contents
+    else
+      hash[:attachment] = Base64.encode64(file_contents)
+    end
 
+    asset = ::Insup::Insales::Asset.new(hash)
     assets_list << asset
+    changed
+    notify_observers(CREATED_FILE, file)
   end
 
   def upload_modified_file(file)
@@ -56,18 +71,26 @@ class Insup::Uploader::InsalesUploader < Insup::Uploader
 
     if !asset
       upload_new_file(file)
+      return
     end
 
-    puts "Updating #{file.path}".yellow
+    changed
+    notify_observers(MODIFYING_FILE, file)
 
     file_contents = File.read(file.path)
 
     if asset.content_type.start_with? 'text/'
-      asset.update_attribute(:content, file_contents)
+      res = asset.update_attribute(:content, file_contents)
+      if !res
+        process_error(asset, file)
+      end
     else
       remove_file(file)
       upload_new_file(file)
     end
+
+    changed
+    notify_observers(MODIFIED_FILE, file)
   end
 
   def remove_file(file)
@@ -77,9 +100,15 @@ class Insup::Uploader::InsalesUploader < Insup::Uploader
       raise InsalesUploaderError, "Cannot find remote counterpart for file #{file.path}"
     end
 
-    puts "Deleting #{file.path}".red
-    asset.destroy
-    assets_list.delete(asset)
+    changed
+    notify_observers(DELETING_FILE, file)
+
+    if pd=asset.destroy
+      assets_list.delete(asset)
+    end
+
+    changed
+    notify_observers(DELETED_FILE, file)
   end
 
 private
@@ -89,6 +118,14 @@ private
     'templates/' => 'Asset::Template'
   }.freeze
 
+  def process_error(entity, file)
+    changed
+    entity.errors.full_messages.each do |err|
+      Insup.logger.error(err)
+      notify_observers(ERROR, file, err)
+    end
+  end
+
   def get_asset_type path
     res = nil
 
@@ -103,7 +140,15 @@ private
   end
 
   def theme
-    @theme ||= ::Insup::Insales::Theme.find(@config['theme_id'])
+    @theme ||= themes[theme_id]
+  end
+
+  def theme_id
+    @config.uploader['theme_id']
+  end
+
+  def themes
+    @themes ||= Hash[@insales.themes.map{|t| [t.id, t]}]
   end
 
   def find_asset file

data/lib/insup/uploader.rb

@@ -1,4 +1,17 @@
+require 'observer'
+
 class Insup::Uploader
+  include Observable
+
+  CREATING_FILE = 0
+  CREATED_FILE = 1
+  MODIFYING_FILE = 2
+  MODIFIED_FILE = 3
+  DELETING_FILE = 4
+  DELETED_FILE = 5
+  BATCH_UPLOADING_FILES = 6
+  BATCH_UPLOADED_FILES = 7
+  ERROR = 8
 
   def self.uploader(uploader_alias)
     @@uploaders ||= {}
@@ -23,4 +36,13 @@ class Insup::Uploader
     end
   end
 
+  def process_file(file)
+    case file.state
+    when Insup::TrackedFile::DELETED
+      remove_file(file)
+    else
+      upload_file(file)
+    end
+  end
+
 end

data/lib/insup/version.rb

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

data/lib/insup.rb

@@ -1,21 +1,33 @@
-require 'colorize'
 require 'fileutils'
 
-module Insup
+class Insup
+
+  def self.logger=(val)
+    @logger = val
+    Insup::Insales.logger = @logger
+  end
+
+  def self.logger
+    @logger
+  end
+
+  def initialize(base, settings)
+    @settings = settings
+    @base = base
+  end
 
   # Initializes a directory with a default .insup file
-  def self.init(dir = nil)
+  def self.create_insup_file(dir = nil)
     dir ||= Dir.getwd
-
-    template_file = File.join(File.dirname(File.expand_path(__FILE__)), '../.insup.template')
+    template_file = File.join(File.dirname(File.expand_path(__FILE__)), '../insup.template')
     FileUtils.cp(template_file, File.join(dir, '.insup'))
   end
 
-  def self.list_locations
-    puts Insup::Settings.instance.tracked_locations
+  def tracked_locations
+    @settings.tracked_locations
   end
 
-  def self.list_files(options = {})
+  def files(options = {})
     files = case options[:mode]
     when nil
       tracker.tracked_files
@@ -24,85 +36,61 @@ module Insup
     when :ignored
       tracker.ignored_files
     end
-
-    puts files
   end
 
-  def self.uploader
-    @uploader ||= if uploader_conf = Settings.instance.uploader
-      klass = Insup::Uploader.find_uploader(uploader_conf['class']) || Object::const_get(uploader_conf['class'])
-      klass.new(uploader_conf)
+  def commit(files = nil)
+    if files.nil? || files.empty?
+      list = changes
     else
-      Uploader::Dummy.new({})
+      list = files.map do |f|
+        mode = File.exist?(f) ? TrackedFile::MODIFIED : TrackedFile::DELETED
+        TrackedFile.new(f, mode)
+      end
+    end
+
+    list.each do |file|
+      uploader.process_file(file)
     end
   end
 
-  def self.tracker
-    @tracker ||= if tracker_conf = Settings.instance.tracker
-      klass = Insup::Tracker.find_tracker(tracker_conf['class']) || Object::const_get(tracker_conf['class'])
-      klass.new(tracker_conf)
+  def uploader
+    @uploader ||= if uploader_conf = @settings.uploader
+      klass = Insup::Uploader.find_uploader(uploader_conf['class']) || Object::const_get(uploader_conf['class'])
+      klass.new(@settings)
     else
-      Tracker::SimpleTracker.new({})
+      Uploader::Dummy.new(@settings)
     end
   end
 
-  def self.commit(changed_files = nil)
-    begin
-      changed_files ||= get_changes
-      uploader = get_uploader
-      uploader.process_all changed_files
-    rescue => ex
-      puts ex
+  def tracker
+    @tracker ||= if tracker_conf = @settings.tracker
+      klass = Insup::Tracker.find_tracker(tracker_conf['class']) || Object::const_get(tracker_conf['class'])
+      klass.new(@base, @settings)
+    else
+      Tracker::SimpleTracker.new(@settings)
     end
   end
 
-  def self.status
-    tracker.changes.each do |x|
-      case x.state
-      when Insup::TrackedFile::NEW
-        puts "New:      #{x.path}".green
-      when Insup::TrackedFile::MODIFIED
-        puts "Modified: #{x.path}".yellow
-      when Insup::TrackedFile::DELETED
-        puts "Deleted:  #{x.path}".red
-      end
-    end
+  def insales
+    @insales ||= Insales.new(@settings)
   end
 
-  def self.print_config
-    puts "Tracker: #{Insup::Settings.instance.tracker['class']}"
-    puts "Uploader: #{Insup::Settings.instance.uploader['class']}"
-    puts 'Tracked locations:'
-    puts Settings.instance.tracked_locations.map{|loc| "\t#{loc}"}
-    puts 'Ignore patterns:'
-    puts Settings.instance.ignore_patterns.map{|ip| "\t#{ip}"}
+  def changes
+    tracker.changes
   end
 
-  def self.listen
-    puts 'Listening...'
-    listener = Listener.new(Dir.getwd)
+  def listen
+    @listener = Listener.new(@base, @settings)
 
-    listener.listen do |changes|
+    @listener.listen do |changes|
       changes.each do |change|
-        case change.state
-        when Insup::TrackedFile::DELETED
-          uploader.remove_file(change)
-        else
-          uploader.upload_file(change)
-        end
+        uploader.process_file(change)
       end
     end
+  end
 
-    exit_requested = false
-    Kernel.trap( "INT" ) { exit_requested = true }
-
-    while !exit_requested do
-      sleep 0.1
-    end
-
-    puts 'Stopping listener...'
-    listener.stop
-    puts 'Terminated by user'
+  def stop_listening
+    @listener.stop
   end
 
 end

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

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

data/spec/spec_helper.rb

@@ -3,3 +3,4 @@ require 'coveralls'
 Coveralls.wear!
 
 require_relative('../lib/insup')
+require_relative('../lib/insup/console')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insup
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '0.2'
 platform: ruby
 authors:
 - HttpLab
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -89,16 +89,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".insup.template"
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - bin/insup
 - insup.gemspec
+- insup.template
 - lib/insup.rb
+- lib/insup/console.rb
+- lib/insup/console/upload_observer.rb
 - lib/insup/exceptions.rb
 - lib/insup/git.rb
 - lib/insup/insales.rb
@@ -115,6 +118,7 @@ files:
 - lib/insup/uploader/dummy_uploader.rb
 - lib/insup/uploader/insales_uploader.rb
 - lib/insup/version.rb
+- spec/lib/insup/console/upload_observer_spec.rb
 - spec/lib/insup/git_spec.rb
 - spec/lib/insup/settings_spec.rb
 - spec/lib/insup/tracker_spec.rb

data/.insup.template

@@ -1,23 +0,0 @@
-track:
-  - media
-  - snippets
-  - templates
-
-tracker:
-  class: git
-
-insales:
-  subdomain:
-  api_key:
-  password:
-
-uploader:
-  class: insales
-  theme_id:
-
-ignore:
-  - '*.swp'
-  - '*.swx'
-  - '.*'
-  - 'thumbs.db'
-  - '.DS_Store'