smartkiosk-server 0.10.4 → 0.10.5

data/.gitignore

@@ -19,6 +19,7 @@
 /public/uploads
 /public/builds
 /public/assets
+/public/gems
 
 # Ignore the default SQLite database.
 /db/*.sqlite3*

data/Gemfile

@@ -69,3 +69,5 @@ group :development do
 end
 
 gem 'iso8583-mkb', '0.0.2'
+
+gem 'bundler', '~> 1.2.3'

data/Gemfile.lock

@@ -385,6 +385,7 @@ DEPENDENCIES
   axlsx
   better_errors
   binding_of_caller
+  bundler (~> 1.2.3)
   capistrano
   carrierwave
   clockwork

data/app/admin/terminal_builds.rb

@@ -7,7 +7,16 @@ ActiveAdmin.register TerminalBuild do
   index do
     selectable_column
     column :id
-    column :version
+    column :version do |tb|
+      div tb.version
+
+      if tb.gems_ready
+        status_tag(I18n.t('smartkiosk.admin.terminal_build.gems_ready'), :ok)
+      else
+        status_tag(I18n.t('smartkiosk.admin.terminal_build.gems_not_ready'), :error)
+      end
+
+    end
     column :source do |tb|
       link_to File.basename(tb.source.path), tb.source.url
     end
@@ -23,6 +32,9 @@ ActiveAdmin.register TerminalBuild do
       row :source do |tb|
         link_to File.basename(tb.source.path), tb.source.url
       end
+      row :gems_ready do |tb|
+        status_boolean(self, tb.gems_ready)
+      end
       row :created_at
       row :updated_at
     end
@@ -35,5 +47,5 @@ ActiveAdmin.register TerminalBuild do
     end
     f.actions
   end
-  
+
 end

data/app/admin/terminals.rb

@@ -2,8 +2,8 @@ ActiveAdmin.register Terminal do
 
   SIMPLE_ORDERS = Terminal::ORDERS.select{|x| x != 'upgrade'} unless defined?(SIMPLE_ORDERS)
 
-  menu :parent   => I18n.t('activerecord.models.terminal.other'), 
-       :label    => I18n.t('smartkiosk.admin.menu.manage'), 
+  menu :parent   => I18n.t('activerecord.models.terminal.other'),
+       :label    => I18n.t('smartkiosk.admin.menu.manage'),
        :priority => 1,
        :if       => proc { can? :index, Terminal }
 
@@ -62,11 +62,16 @@ ActiveAdmin.register Terminal do
   member_action :upgrade, :method => :post do
     build = TerminalBuild.find(params[:build_id])
 
-    Terminal.where(:id => params[:id].split(',')).each do |t|
-      t.order! :upgrade, build.id, build.version, build.path, build.url
+    if build.gems_ready
+      Terminal.where(:id => params[:id].split(',')).each do |t|
+        t.order! :upgrade, build.id, build.version, build.path, build.url, URI.join(root_url, "/gems").to_s
+      end
+
+      redirect_to :action => :index
+    else
+      redirect_to :back, :flash => { :error => I18n.t('smartkiosk.admin.terminal_build.gems_not_ready_error') }
     end
 
-    redirect_to :action => :index
   end
 
   SIMPLE_ORDERS.each do |order|
@@ -80,7 +85,7 @@ ActiveAdmin.register Terminal do
   # INDEX
   #
   batch_action(
-    I18n.t('smartkiosk.admin.actions.terminals.upgrade'), 
+    I18n.t('smartkiosk.admin.actions.terminals.upgrade'),
     :if => proc{current_user.priveleged?(:terminals, :upgrade)}
   ) do |selection|
     redirect_to upgrade_build_admin_terminal_path(Terminal.find(selection).map(&:id).join(','))

data/app/models/terminal_build.rb

@@ -1,6 +1,11 @@
 require 'digest/md5'
 
 class TerminalBuild < ActiveRecord::Base
+  include Redis::Objects
+
+  lock :stash_worker, :global => true, :timeout => 0.1
+  counter :stash_counter, :global => true
+
   mount_uploader :source, ZipUploader
 
   validates :source, :presence => true
@@ -24,10 +29,12 @@ class TerminalBuild < ActiveRecord::Base
     end
 
     self.update_attributes :hashes => build_hashes
+    update_stash
   end
 
   after_destroy do
     FileUtils.rm_rf path
+    update_stash
   end
 
   def path
@@ -59,4 +66,12 @@ class TerminalBuild < ActiveRecord::Base
 
     hashes
   end
+
+  protected
+
+  def update_stash
+    TerminalBuild.stash_counter.incr
+
+    GemStashUpdateWorker.perform_async
+  end
 end

data/app/workers/gem_stash_update_worker.rb

@@ -0,0 +1,43 @@
+require "gem_stasher"
+
+class GemStashUpdateWorker
+  include Sidekiq::Worker
+
+  sidekiq_options :retry => false
+
+  def perform
+    begin
+      TerminalBuild.stash_worker_lock.lock do
+        while TerminalBuild.stash_counter.getset(0) > 0
+          update_stash!
+        end
+      end
+    rescue Redis::Lock::LockTimeout => e
+      Sidekiq::Logging.logger.warn "Lock timeout."
+
+      # To avoid excessive cpu burning but still ensure robust updates
+      GemStashUpdateWorker.perform_in 1.minute
+    end
+  end
+
+  def update_stash!
+    builds = TerminalBuild.all
+
+    stasher = GemStasher.new Sidekiq::Logging.logger, Rails.root.join("public/gems")
+    stasher.maintain_cache builds.map(&:path)
+    stasher.update_index
+
+    TerminalBuild.transaction do
+      builds.each do |build|
+        begin
+          build.gems_ready = true
+
+          build.save!
+        rescue => e
+          Sidekiq::Logging.logger.warn "error occured during update of build #{build.id}: #{e}"
+        end
+      end
+    end
+
+  end
+end

data/config/locales/activerecord.ru.yml

@@ -14,7 +14,7 @@ ru:
               not_a_hash: содержат неправильный формат
         rebate:
           attributes:
-            start: 
+            start:
               too_large: должна быть меньше даты окончания
           conditions_intersect: Условия выборки пересекаются
           requires_commission_intersects: Нельзя указать разные типы связи с комиссией в рамках одного шлюза
@@ -25,7 +25,7 @@ ru:
               too_large: должно быть меньше До
         commission:
           attributes:
-            start: 
+            start:
               too_large: должна быть меньше даты окончания
           conditions_intersect: Условия выборки пересекаются
           payment_type_intersects: Нельзя указать разные типы связи типа платежа в рамках одного провайдера
@@ -35,7 +35,7 @@ ru:
               too_large: должно быть меньше До
         limit:
           attributes:
-            start: 
+            start:
               too_large: должна быть меньше даты окончания
           conditions_intersect: Условия выборки пересекаются
           payment_type_intersects: Нельзя указать разные типы связи типа платежа в рамках одного провайдера
@@ -178,7 +178,7 @@ ru:
         many: Сверок
         one: Сверка
         other: Сверки
-      terminal: 
+      terminal:
         few: Терминала
         many: Терминалов
         one: Терминал
@@ -244,6 +244,7 @@ ru:
       terminal_build:
         version: Версия
         source: Источник (ZIP)
+        gems_ready: Готова к деплою
         created_at: Дата создания
         updated_at: Дата обновления
       provider_receipt_template:

data/config/locales/smartkiosk.ru.yml

@@ -1,6 +1,6 @@
 ru:
   smartkiosk:
-    welcome: 
+    welcome:
       header: Вы авторизованы как %{user}
       roles: Доступные роли
       properties: Свойства аккаунта
@@ -78,6 +78,10 @@ ru:
           upgrade: Обновление терминалов
           all_pings: Полная история связи
           pings: История связи
+      terminal_build:
+        gems_ready: Готова к деплою
+        gems_not_ready: Подготавливается
+        gems_not_ready_error: Сборка еще подготавливается
     role_priveleges:
       basic:
         create: Создание

data/db/migrate/20121127192257_create_terminal_builds.rb

@@ -4,6 +4,7 @@ class CreateTerminalBuilds < ActiveRecord::Migration
       t.string      :version
       t.string      :source
       t.text        :hashes
+      t.boolean     :gems_ready, :default => false
       t.timestamps
     end
   end

data/db/schema.rb

@@ -370,8 +370,9 @@ ActiveRecord::Schema.define(:version => 20130108091644) do
     t.string   "version"
     t.string   "source"
     t.text     "hashes"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.boolean  "gems_ready", :default => false
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
   end
 
   create_table "terminal_orders", :force => true do |t|

data/lib/gem_stasher.rb

@@ -0,0 +1,171 @@
+require "bundler"
+require "rubygems/user_interaction"
+require "rubygems/package"
+require "net/http"
+require "set"
+require "fileutils"
+
+# Make LazySpecification Set-able
+class Bundler::LazySpecification
+  alias :eql? :==
+
+  def hash
+    [ @name, @version, @dependencies, @platform, @source ].hash
+  end
+end
+
+class GemStasher
+  def initialize(logger, gempath)
+    @logger = logger
+    @gempath = gempath
+  end
+
+  def maintain_cache(builds)
+    sources = Set.new
+    required_gems = Set.new
+    existing_gems = Set.new
+
+    FileUtils.mkdir_p "#{@gempath}/gems"
+
+    @logger.info "Updating gem cache"
+
+    Dir["#{@gempath}/gems/*.gem"].each do |gempack|
+      begin
+        File.open(gempack) do |io|
+          Gem::Package.open(io, 'r', nil) do |gem|
+            spec = Bundler::LazySpecification.new(
+              gem.metadata.name,
+              gem.metadata.version,
+              gem.metadata.platform
+            )
+
+            existing_gems.add spec
+          end
+        end
+      rescue => e
+        @logger.warn "unable to read #{gempack}: #{e}"
+        File.delete gempack
+      end
+    end
+
+    builds.each do |build|
+      begin
+        gemfile = Bundler::Definition.build File.join(build, "Gemfile"),
+                                        File.join(build, "Gemfile.lock"), {}
+
+        gemfile.sources.each do |source|
+          next unless source.kind_of? Bundler::Source::Rubygems
+
+          source.remotes.each { |remote| sources.add remote }
+        end
+
+        gemfile.resolve.each do |spec|
+
+          required_gems.add Bundler::LazySpecification.new(
+            spec.name,
+            spec.version,
+            spec.platform
+          )
+        end
+      rescue => e
+        @logger.warn "unable to process #{build}: #{e}"
+      end
+    end
+
+    dead_gems    = existing_gems - required_gems
+    missing_gems = required_gems - existing_gems
+
+    dead_gems.each do |spec|
+      @logger.info "- deleting dead #{spec.name} #{spec.version}"
+
+      filename = filename_for_spec spec
+
+      begin
+        File.delete "#{@gempath}/#{filename}"
+      rescue => e
+        @logger.warn "unable to delete #{filename}: #{e}"
+      end
+    end
+
+    if missing_gems.any?
+      sources.each do |uri|
+        fetcher = Bundler::Fetcher.new uri
+
+        names = missing_gems.map { |gem| gem.name }
+        specs = fetcher.specs names, uri
+
+        missing_gems.each do |gem|
+          found = specs.local_search gem
+
+          next unless found.any?
+
+          missing_gems.delete gem
+
+          spec, = found
+          filename = filename_for_spec spec
+          local_file_name = "#{@gempath}/#{filename}"
+
+          file_uri = uri.dup
+          file_uri.path = "#{uri.path}#{filename}"
+
+          @logger.info " - fetching #{spec.name} #{spec.version} from #{uri}"
+
+          io = File.open(local_file_name, "wb")
+          begin
+            fetch_file file_uri, io
+          rescue => e
+            File.delete io
+            warn "unable to download #{filename}: #{e}"
+          ensure
+            io.close
+          end
+        end
+      end
+
+      if missing_gems.any?
+        @logger.warn "unresolved dependencies:"
+        missing_gems.each do |spec|
+          @logger.warn " - #{spec}"
+        end
+      end
+    end
+  end
+
+  def update_index
+    @logger.info "Updating gem index at #{@gempath}"
+    # unfortunately, it's not possible to use Gem::Index without breaking
+    # host application bundler.
+    Bundler.with_clean_env do
+      system "gem", "generate_index", "--directory", @gempath.to_s, "--quiet"
+    end
+  end
+
+  private
+
+  def filename_for_spec(spec)
+    "gems/#{spec.name}-#{spec.version}.gem"
+  end
+
+  def fetch_file(uri, io)
+    Net::HTTP.start(uri.host,
+                    uri.port,
+                    :use_ssl => uri.scheme == 'https',
+                    :verify_mode => OpenSSL::SSL::VERIFY_NONE
+                   ) do |http|
+      http.request_get(uri.path) do |response|
+        case response
+        when Net::HTTPSuccess
+          response.read_body { |chunk| io.write chunk }
+
+        when Net::HTTPRedirection
+          fetch_file URI.join(uri.to_s, response['location']), io
+
+        else
+          raise response.value
+        end
+      end
+    end
+  end
+end
+
+Bundler.settings[:frozen] = true

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.10.4'
+    VERSION = '0.10.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,6 +176,7 @@ files:
 - app/views/admin/terminals/upgrade_build.html.arb
 - app/views/layouts/application.html.erb
 - app/views/welcome/index.html.erb
+- app/workers/gem_stash_update_worker.rb
 - app/workers/pay_worker.rb
 - app/workers/report_worker.rb
 - app/workers/revise_worker.rb
@@ -272,6 +273,7 @@ files:
 - lib/date_expander.rb
 - lib/dav4rack/build_resource.rb
 - lib/formtastic/inputs/selectable_check_boxes.rb
+- lib/gem_stasher.rb
 - lib/paper_trail/version_fix.rb
 - lib/report_builder.rb
 - lib/seeder.rb
@@ -321,7 +323,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1639411805563885975
+      hash: -1133320975275850938
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: