smashing 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489df6284b7c807ceeaa8491046cc8e83844442877ed423b87c3ce5033de379b
-  data.tar.gz: b9fc9ba27fd0f7031f45a3eead80a39566e907e0d4cc05e99423d4ba2ef6b1e6
+  metadata.gz: 6f8f8fb6bb541b6c3423dbd9a07a5adf9d68c74b1e40631d8adfd9f483bafc71
+  data.tar.gz: 39043eca7120a94098d95d3e90555d81d2bd80189cc172dce62dad8f3c082b4b
 SHA512:
-  metadata.gz: 1a1a8ef4a2edf551efe3da624afea0656d37148f938a7c4fa9f1c29776745f276c4f3bc748cdeee3a4dc6db74d5e015314af27d9f3e0dd88ce35295ee254d1a6
-  data.tar.gz: 992126548cc51c8c24d558c3f4fde25412f665d016c3022941a069e560e27a77eb6931193ceb47837b463250d13119f399b314052a756d0d890900f26e9496b4
+  metadata.gz: 8056ec91983755e1d60b80acb8098acc2e4c0cd5bdd568e31bf0d154b44a6c77afaba06dc2e0d447ae2dd84e7f3c2d01aaf254f368b1207fb8d0c91e52b3077c
+  data.tar.gz: 03e3c4e500e57409d98a7cc316fb3f40d829e271f687d7d4076404c4e0e1dd8706c969b2f1cc5b3dc2ed260110df74b045bb4285a7d909046d04b8ce0cdcbb6d

data/javascripts/dashing.coffee

@@ -96,7 +96,10 @@ Dashing.AnimatedValue =
     else
       timer = "interval_#{k}"
       num = if (!isNaN(@[k]) && @[k]?) then @[k] else 0
-      unless @[timer] || num == to
+      # NOTE: We are using backticks in the num == to below as that is a comparison with string
+      # and float and CoffeeScript compiles it to ===, causing it to always fail - see issue #155
+      # https://github.com/Smashing/smashing/pull/155
+      unless @[timer] || `num == to`
         to = parseFloat(to)
         num = parseFloat(num)
         up = to > num

data/lib/dashing.rb

@@ -1,6 +1,7 @@
 require 'dashing/cli'
 require 'dashing/downloader'
 require 'dashing/app'
+require 'dashing/version'
 
 module Dashing
 end

data/lib/dashing/app.rb

@@ -3,7 +3,8 @@ require 'sprockets'
 require 'sinatra/content_for'
 require 'rufus/scheduler'
 require 'coffee-script'
-require 'sass'
+require 'sass' if RUBY_VERSION < "2.5.0"
+require 'sassc' if RUBY_VERSION >= "2.5.0"
 require 'json'
 require 'yaml'
 require 'thin'

data/lib/dashing/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'open-uri'
+require 'dashing/version'
 
 module Dashing
   class CLI < Thor
@@ -25,6 +26,12 @@ module Dashing
       end
     end
 
+    desc "--version, -v", "Prints the version"
+    map %w[--version -v] => :__print_version
+    def __print_version
+      say "#{Dashing::VERSION}"
+    end
+
     desc "new PROJECT_NAME", "Sets up ALL THE THINGS needed for your dashboard project."
     def new(name)
       @name = Thor::Util.snake_case(name)

data/lib/dashing/version.rb

@@ -0,0 +1,3 @@
+module Dashing
+  VERSION = "1.3.0".freeze
+end

data/templates/project/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gem 'smashing'
 
-## Remove this if you don't need a twitter widget.
-gem 'twitter', '>= 5.9.0'
+## Uncomment this if you want to see use the twitter widget.
+# gem 'twitter', '>= 5.9.0'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: smashing
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel Beauchamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.24
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.24
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -86,70 +72,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +271,7 @@ files:
 - lib/dashing/app.rb
 - lib/dashing/cli.rb
 - lib/dashing/downloader.rb
+- lib/dashing/version.rb
 - templates/dashboard/%name%.erb.tt
 - templates/job/%name%.rb
 - templates/project/.gitignore
@@ -311,7 +312,7 @@ files:
 - templates/project/jobs/buzzwords.rb
 - templates/project/jobs/convergence.rb
 - templates/project/jobs/sample.rb
-- templates/project/jobs/twitter.rb
+- templates/project/jobs/twitter.rb.disabled
 - templates/project/lib/.empty_directory
 - templates/project/public/404.html
 - templates/project/public/favicon.ico