Upstream changes

.gitignore

@@ -1,3 +1,8 @@
 *DS_STORE
 /Gemfile.lock
-*.gem
+*.gem
+coverage/
+log/
+tmp/
+.ruby-version
+history.yml

.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
 
-script: "rake test"
+script: "rake test"

CONTRIBUTING.md

@@ -0,0 +1,16 @@
+<a name="issues"></a>
+## Have an Issue?
+
+Dashing is no longer being actively maintained.
+
+1. Check the [Troubleshooting Guide](https://github.com/Shopify/dashing/wiki#how-tos) in the wiki.
+2. Use the [GitHub Issue Search](https://help.github.com/articles/searching-issues/) to check if the issue has already been reported.
+3. You can ask your issue on the tracker, but your best bet is to go to [Stack Overflow](http://stackoverflow.com/questions/tagged/dashing)
+
+
+<a name="features"></a>
+
+If you feel that you have a really amazing, super neato idea that should be a part of Dashing, it may be a good candidate for an external Gem which supercharges a project. An excellent example of this is
+[dashing-contrib](https://github.com/QubitProducts/dashing-contrib). If you
+do create a third-party extension for Dashing, please add it [here](https://github.com/Shopify/dashing/wiki/Additional-Widgets#other-third-party-tools).
+

MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Shopify
+Copyright (c) 2016 Shopify
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -1,9 +1,11 @@
 # [Dashing](http://shopify.github.com/dashing)
-![](https://api.travis-ci.org/Shopify/dashing.png)
+[![Build Status](https://secure.travis-ci.org/Shopify/dashing.png?branch=master)](http://travis-ci.org/Shopify/dashing)
 
 Dashing is a Sinatra based framework that lets you build beautiful dashboards. It looks especially great on TVs.
 
 [Check out the homepage](http://shopify.github.com/dashing).
 
+Note: Dashing is no longer being actively maintained. Read about it [here](https://github.com/Shopify/dashing/issues/711). There is a fork of the project being maintained at at [https://github.com/dashing-io/dashing](https://github.com/dashing-io/dashing)
+
 # License
-Distributed under the [MIT license](https://github.com/Shopify/dashing/blob/master/MIT-LICENSE)
+Distributed under the [MIT license](MIT-LICENSE)

Rakefile

@@ -1,10 +1,11 @@
 require 'rubygems'
 require 'rake'
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
 end
 
-task :default => [:test]
+task :default => [:test]

bin/dashing

@@ -1,112 +1,9 @@
 #!/usr/bin/env ruby
-
-require 'thor'
-require 'net/http'
-require 'json'
-require 'open-uri'
-
-class MockScheduler
-  def method_missing(*args)
-    yield
-  end
-end
-
-SCHEDULER = MockScheduler.new
-
-module Dashing
-
-  class CLI < Thor
-    include Thor::Actions
-
-    class << self
-      attr_accessor :auth_token
-
-      def hyphenate(str)
-        return str.downcase if str =~ /^[A-Z-]+$/
-        str.gsub('_', '-').gsub(/\B[A-Z]/, '-\&').squeeze('-').downcase
-      end
-    end
-
-    attr_accessor :name
-
-    no_tasks do
-      ['widget', 'dashboard', 'job'].each do |type|
-        define_method "generate_#{type}" do |name|
-          @name = Thor::Util.snake_case(name)
-          directory type.to_sym, File.join("#{type}s")
-        end
-      end
-    end
-
-    def self.source_root
-      File.expand_path('../../templates', __FILE__)
-    end
-
-    desc "new PROJECT_NAME", "Sets up ALL THE THINGS needed for your dashboard project."
-    def new(name)
-      @name = Thor::Util.snake_case(name)
-      directory :project, @name
-    end
-
-    desc "generate (widget/dashboard/job) NAME", "Creates a new widget, dashboard, or job."
-    def generate(type, name)
-      send("generate_#{type}".to_sym, name)
-    rescue NoMethodError => e
-      puts "Invalid generator. Either use widget, dashboard, or job"
-    end
-    map "g" => :generate
-
-    desc "install GIST_ID", "Installs a new widget from a gist."
-    def install(gist_id)
-      public_url = "https://gist.github.com/#{gist_id}"
-      gist = JSON.parse(open("https://api.github.com/gists/#{gist_id}").read)
-
-      gist['files'].each do |filename, contents|
-        if filename.end_with?(".rb")
-          create_file File.join(Dir.pwd, 'jobs', filename), contents['content']
-        elsif filename.end_with?(".coffee", ".html", ".scss")
-          widget_name = File.basename(filename, '.*')
-          create_file File.join(Dir.pwd, 'widgets', widget_name, filename), contents['content']
-        end
-      end
-
-      print set_color("Don't forget to edit the ", :yellow)
-      print set_color("Gemfile ", :yellow, :bold)
-      print set_color("and run ", :yellow)
-      print set_color("bundle install ", :yellow, :bold)
-      say set_color("if needed. More information for this widget can be found at #{public_url}", :yellow)
-
-    rescue OpenURI::HTTPError => e
-      say set_color("Could not find gist at #{public_url}"), :red
-    end
-    map "i" => :install
-
-    desc "start", "Starts the server in style!"
-    method_option :job_path, :desc => "Specify the directory where jobs are stored"
-    def start(*args)
-      port_option = args.include?('-p')? '' : ' -p 3030'
-      args = args.join(" ")
-      command = "bundle exec thin -R config.ru start #{port_option} #{args}"
-      command.prepend "export JOB_PATH=#{options[:job_path]}; " if options[:job_path]
-      system(command)
-    end
-    map "s" => :start
-
-    desc "stop", "Stops the thin server"
-    def stop
-      command = "bundle exec thin stop"
-      system(command)
-    end
-
-    desc "job JOB_NAME AUTH_TOKEN(optional)", "Runs the specified job. Make sure to supply your auth token if you have one set."
-    def job(name, auth_token = "")
-      Dir[File.join(Dir.pwd, 'lib/**/*.rb')].each {|file| require file }
-      self.class.auth_token = auth_token
-      f = File.join(Dir.pwd, "jobs", "#{name}.rb")
-      require f
-    end
-
-  end
-end
-
-Dashing::CLI.start
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+$:.unshift File.expand_path("../../lib", bin_file)
+
+require 'dashing/cli'
+require 'dashing/downloader'
+Dashing::CLI.source_root(File.expand_path('../../templates', bin_file))
+Dashing::CLI.start(ARGV)

dashing.gemspec

@@ -2,29 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dashing'
-  s.version     = '1.3.2'
-  s.date        = '2013-11-21'
-  s.executables << 'dashing'
+  s.version     = '1.3.7'
+  s.date        = '2016-04-11'
+  s.executables = %w(dashing)
 
 
   s.summary     = "The exceptionally handsome dashboard framework."
   s.description = "This framework lets you build & easily layout dashboards with your own custom widgets. Use it to make a status boards for your ops team, or use it to track signups, conversion rates, or whatever else metrics you'd like to see in one spot. Included with the framework are ready-made widgets for you to use or customize. All of this code was extracted out of a project at Shopify that displays dashboards on TVs around the office."
   s.author      = "Daniel Beauchamp"
   s.email       = '[email protected]'
-  s.files       = ["lib/Dashing.rb"]
   s.homepage    = 'http://shopify.github.com/dashing'
+  s.license     = "MIT"
 
   s.files = Dir['README.md', 'javascripts/**/*', 'templates/**/*','templates/**/.[a-z]*', 'lib/**/*']
 
-  s.add_dependency('sass')
-  s.add_dependency('coffee-script', '>=1.6.2')
-  s.add_dependency('execjs', '>=2.0.0')
-  s.add_dependency('sinatra')
-  s.add_dependency('sinatra-contrib')
-  s.add_dependency('thin')
-  s.add_dependency('rufus-scheduler', '~> 2.0')
-  s.add_dependency('thor')
-  s.add_dependency('sprockets')
-  s.add_dependency('rack')
+  s.add_dependency('sass', '~> 3.2.12')
+  s.add_dependency('coffee-script', '~> 2.2.0')
+  s.add_dependency('execjs', '~> 2.0.2')
+  s.add_dependency('sinatra', '~> 1.4.4')
+  s.add_dependency('sinatra-contrib', '~> 1.4.2')
+  s.add_dependency('thin', '~> 1.6.1')
+  s.add_dependency('rufus-scheduler', '~> 2.0.24')
+  s.add_dependency('thor', '> 0.18.1')
+  s.add_dependency('sprockets', '~> 2.10.1')
+  s.add_dependency('rack', '~> 1.5.4')
 
-end
+  s.add_development_dependency('rake', '~> 10.1.0')
+  s.add_development_dependency('haml', '~> 4.0.4')
+  s.add_development_dependency('minitest', '~> 5.2.0')
+  s.add_development_dependency('mocha', '~> 0.14.0')
+  s.add_development_dependency('fakeweb', '~> 1.3.0')
+  s.add_development_dependency('simplecov', '~> 0.8.2')
+end

javascripts/dashing.coffee

@@ -40,7 +40,6 @@ class Dashing.Widget extends Batman.View
     @mixin($(@node).data())
     Dashing.widgets[@id] ||= []
     Dashing.widgets[@id].push(@)
-    @mixin(Dashing.lastEvents[@id]) # in case the events from the server came before the widget was rendered
 
     type = Batman.Filters.dashize(@view)
     $(@node).addClass("widget widget-#{type} #{@id}")
@@ -55,6 +54,12 @@ class Dashing.Widget extends Batman.View
   @::on 'ready', ->
     Dashing.Widget.fire 'ready'
 
+    # In case the events from the server came before the widget was rendered
+    lastData = Dashing.lastEvents[@id]
+    if lastData
+      @mixin(lastData)
+      @onData(lastData)
+
   receiveData: (data) =>
     @mixin(data)
     @onData(data)