qujo 0.1.1 → 0.1.2

data/Rakefile

@@ -36,3 +36,53 @@ end
 
 
 task :default => :test
+
+def changelog(last=nil, single=false)
+  command="git --no-pager log --format='%an::::%h::::%s'"
+
+  list = `git tag`
+
+  puts "# Changelog"
+  puts
+
+  ordered = list.lines.sort_by {|e| (a,b,c) = e.gsub(/^v/,"").split("."); "%3d%3d%3d" % [a, b, c]}
+
+  ordered.reject{|e| (a,b,c,d) = e.split("."); !d.nil?}.reverse_each do |t|
+    tag = t.chomp
+
+    if last
+      check = { }
+      out   = []
+      log   = `#{command} #{last}...#{tag}`
+      log.lines.each do |line|
+        (who, hash, msg) = line.split('::::')
+        unless check[msg]
+          unless msg =~ /^Merge branch/ || msg =~ /CHANGELOG/ || msg =~ /^(v|version|changes for|preparing|ready for release|ready to release|bump version)*\s*(v|version)*\d+\.\d+\.\d+/
+            msg.gsub(" *", "\n*").gsub(/^\*\*/, "  *").lines.each do |l|
+              line = l =~ /^(\s+)*\*/ ? l : "* #{l}"
+              out << line
+            end
+            check[msg] = hash
+          end
+        end
+      end
+      puts "## #{last}:"
+      out.each { |e| puts e }
+      #puts log
+      puts
+    end
+
+    last = tag
+    exit if single
+  end
+end
+
+desc "generate changelog output"
+task :changelog do
+  changelog
+end
+
+desc "show current changes (changelog output from HEAD to most recent tag)"
+task :current do
+  changelog("HEAD",true)
+end

data/app/assets/javascripts/qujo/qujo.js

@@ -1,3 +1,5 @@
+var intervalTime = 2000;
+var timeoutTime = 600000;
 var interval = null;
 $(function () {
     var queuestatus = $("#qujo_status").first();
@@ -15,6 +17,9 @@ $(function () {
     function qError(){
         queuestatus.addClass("label-important");
     }
+    function qWarn(){
+        queuestatus.addClass("label-warning");
+    }
     function jFine(){
         jobstatus.removeClass("badge-important");
     }
@@ -59,7 +64,8 @@ $(function () {
                 rError();
             }
         }).fail(function (d) {
-                console.log("status: fail: "+d);
+                console.log("status: fail: ");
+                console.log(d);
                 qStop();
                 qError();
                 jError();
@@ -72,7 +78,12 @@ $(function () {
     }
 
     if (jobstatus.size()) {
-        interval = setInterval(updateStatus, 2000);
+        interval = setInterval(updateStatus, intervalTime);
+        timeout = setTimeout(function(){
+            console.log("disable interval");
+            qWarn();
+            clearInterval(interval);
+        }, timeoutTime); // disable interval after 10 minutes of inactivity
     }
 
     $(".create_job").on("click", function () {

data/lib/qujo.rb

@@ -14,7 +14,7 @@ module Qujo
     def configure
       @cfg ||= OpenStruct.new({
           :ui_status => true,
-          :logger => Rails.logger,
+          :logger => ::Rails.logger,
           :models => "Jobs"
       })
       yield @cfg if block_given?

data/lib/qujo/version.rb

@@ -2,7 +2,7 @@ module Qujo
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY = 1
+    TINY = 2
     TAG = nil
     STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qujo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3642495992486640390
+      hash: -1828845946222427002
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3642495992486640390
+      hash: -1828845946222427002
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25