visage-app 2.0.2 → 2.0.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+2.0.4 - 2012/03/27
+ - Add extra input validation in the builder, so invalid data can't be entered
+   into `profiles.yaml`, per [issue 92](https://github.com/auxesis/visage/issues/92)
+
 2.0.2 - 2012/03/26
  - Builder bugfix for [issue 92](https://github.com/auxesis/visage/issues/92),
    that stopped the builder from presenting the save profile dialog.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    visage-app (2.0.2)
+    visage-app (2.0.4)
       errand (= 0.7.3)
       haml (= 3.1.4)
       sinatra (= 1.3.2)
@@ -12,6 +12,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
+    colorize (0.5.8)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -56,6 +57,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  colorize
   cucumber
   rack-test
   rspec

data/Rakefile

@@ -4,13 +4,17 @@ require 'rubygems'
 require 'bundler/setup'
 require 'cucumber'
 require 'cucumber/rake/task'
+require 'colorize'
+require 'pathname'
+$: << Pathname.new(__FILE__).join('lib').expand_path.to_s
+require 'visage-app/version'
 
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format pretty"
 end
 
 desc "build gem"
-task :build => :lintian do
+task :build => :verify do
   build_output = `gem build visage-app.gemspec`
   puts build_output
 
@@ -19,7 +23,7 @@ task :build => :lintian do
   FileUtils.mkdir_p(pkg_path)
   FileUtils.mv(gem_filename, pkg_path)
 
-  puts "Gem built in #{pkg_path}/#{gem_filename}"
+  puts "Gem built in #{pkg_path}/#{gem_filename}".green
 end
 
 desc "push gem"
@@ -36,26 +40,6 @@ task :push do
   system(command)
 end
 
-desc "perform lintian checks on the JavaScript about to be shipped"
-task :lintian do
-  @count = 0
-  require 'pathname'
-  @root = Pathname.new(File.dirname(__FILE__)).expand_path
-  javascripts_path = @root.join('lib/visage-app/public/javascripts')
-
-  javascripts = Dir.glob("#{javascripts_path + "*"}.js").reject {|f| f =~ /mootools|src\.js/ }
-  javascripts.each do |filename|
-    puts "Checking #{filename}"
-    count = `grep -c 'console.log' #{filename}`.strip.to_i
-    if count > 0
-      puts "#{count} instances of console.log found in #{File.basename(filename)}"
-      @count += 1
-    end
-  end
-
-  abort if @count > 0
-end
-
 desc "clean up various generated files"
 task :clean do
   [ "webrat.log", "pkg/", "_site/"].each do |filename|
@@ -63,3 +47,50 @@ task :clean do
     FileUtils.rm_rf(filename)
   end
 end
+
+namespace :verify do
+  desc "perform lintian checks on the JavaScript about to be shipped"
+  task :lintian do
+    @count = 0
+    require 'pathname'
+    @root = Pathname.new(File.dirname(__FILE__)).expand_path
+    javascripts_path = @root.join('lib/visage-app/public/javascripts')
+
+    javascripts = Dir.glob("#{javascripts_path + "*"}.js").reject {|f| f =~ /mootools|src\.js/ }
+    javascripts.each do |filename|
+      puts "Checking #{filename}".green
+      count = `grep -c 'console.log' #{filename}`.strip.to_i
+      if count > 0
+        puts "#{count} instances of console.log found in #{File.basename(filename)}".red
+        @count += 1
+      end
+    end
+
+    abort if @count > 0
+  end
+
+  task :changelog do
+    changelog_filename = "CHANGELOG.md"
+    version = Visage::VERSION
+
+    if not system("grep ^#{version} #{changelog_filename} 2>&1 >/dev/null")
+      puts "#{changelog_filename} doesn't have an entry for the version you are about to build.".red
+      exit 1
+    end
+  end
+
+  task :uncommitted do
+    uncommitted = `git ls-files -m`.split("\n")
+    if uncommitted.size > 0
+      puts "The following files are uncommitted:".red
+      uncommitted.each do |filename|
+        puts " - #{filename}".red
+      end
+      exit 1
+    end
+  end
+
+  task :all => [ :lintian, :changelog, :uncommitted ]
+end
+
+task :verify => 'verify:all'

data/lib/visage-app/public/javascripts/builder.js

@@ -523,11 +523,25 @@ var ChartBuilder = new Class({
         show.addEvent('click', function(e) {
             e.stop();
 
-            this.showGraphs();
 
-            // Fade the save button once graphs have been rendered.
-            this.save.fade.delay(1500, this.save, 'in')
-            this.profile_name.fade.delay(1500, this.profile_name, 'in')
+            var hosts   = $(this.searchers.host).getElements("div.token.finalized"),
+                metrics = $(this.searchers.metric).getElements("div.token.finalized");
+
+            if (hosts.length > 0 && metrics.length > 0) {
+                this.showGraphs();
+                // Fade the save button once graphs have been rendered.
+                this.save.fade.delay(1500, this.save, 'in')
+                this.profile_name.fade.delay(1500, this.profile_name, 'in')
+            } else {
+                new Message({
+                    title:    'Oops!',
+                    message:  'You need to specify some hosts and metrics before you can show graphs.',
+                    top:      true,
+                    iconPath: '/images/',
+                    icon:     'caution.png',
+                }).say();
+            }
+
         }.bind(this));
 
     },

data/lib/visage-app/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Visage
-  VERSION = "2.0.2"
+  VERSION = "2.0.4"
 end

data/visage-app.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec",     ">= 0"
   s.add_development_dependency "cucumber",  ">= 0"
   s.add_development_dependency "webrat",    ">= 0"
+  s.add_development_dependency "colorize",  ">= 0"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-25 00:00:00 +11:00
+date: 2012-03-26 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,6 +147,18 @@ dependencies:
         - 0
         version: "0"
   requirement: *id010
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: colorize
+  type: :development
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
 description: Visage is a web interface for viewing collectd statistics. It also provides a JSON interface onto collectd's RRD data, giving you an easy way to mash up the data.
 email: 
 - lindsay@holmwood.id.au