cheatset 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7196a91aceb0b2fb4f904c875b1ded33c2a81e60
-  data.tar.gz: 1ca4f3b6a886606ad16fea556a694404329e42fa
+  metadata.gz: 32d4692c040f0ce446aa8652cd3627453f4a7a8f
+  data.tar.gz: 91c7acd9dca1ed99c2465aceaa18bdcd2035e9c3
 SHA512:
-  metadata.gz: edbc9153a8122ba4f4c04b98a54486db87448113c5d2ae787781fd61cbe875949322832e33fff3aef59ee82958ba9ced6db029d3e9e5ad3a59c752f32a18b452
-  data.tar.gz: fc55e53c01d0d74c259989b376b1d0967cb99bb93ab5a0507846a643eaea6d93804e9b8d3b30bae15fd35d465d62e56cec81905bc155f4bb046fdc160ec006b9
+  metadata.gz: 372216808da3a7b9493891ef237ececf07fb8ea41f730aaf28ace4796f0857a053b17d7d96953f70684a60c45ac197787815b580b9837509757c416cdee28eee
+  data.tar.gz: 5671cf5c9ecd7c8e0cbf344394e3de5101b2aacd776714ac80b53cbdc96a195213860da6a7ad7a02f4a149666cf66beecc920f03dc9ffe74b0fad6dbc4024d4f

data/README.md

@@ -31,13 +31,13 @@ cheatsheet do
     id 'Windows'  # Must be unique and is used as title of the category
 
     entry do
-      command 'CMD-n'        # Optional
-      command 'CMD-N'        # Multiple commands are supported
-      name 'Create window'   # A short name, can contain Markdown or HTML
-      notes 'Some notes'     # Optional longer explanation, can contain Markdown or HTML
+      command 'CMD+N'         # Optional
+      command 'CMD+SHIFT+N'   # Multiple commands are supported
+      name 'Create window'    # A short name, can contain Markdown or HTML
+      notes 'Some notes'      # Optional longer explanation, can contain Markdown or HTML
     end
     entry do
-      command 'CMD-w'
+      command 'CMD+W'
       name 'Close window'
     end
   end
@@ -58,17 +58,18 @@ cheatsheet do
   notes 'Some notes at the end of the cheat sheet'
 end
 ```
+
+To convert this file to a docset, call
+
+    $ cheatset generate sample.rb
+
 The following values may contain Markdown or HTML:
 
 * The `introduction` and the `notes` of the cheat sheet
 * The `name` and the `notes` of the entries
 
 For more complete examples look at some of
-[the actual cheat sheets](https://github.com/Kapeli/cheatsheets).
-
-To convert this file to a docset, call
-
-    $ cheatset generate sample.rb
+[the actual cheat sheets](https://github.com/Kapeli/cheatsheets/tree/master/cheatsheets).
 
 ## Thanks
 

data/cheatset.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'cheatset'
   spec.version       = Cheatset::VERSION
   spec.authors       = ['Bogdan Popescu']
-  spec.description   = 'Generate cheatsheets for Dash'
+  spec.description   = 'Generate cheat sheets for Dash'
   spec.summary       = spec.description
   spec.homepage      = 'https://github.com/Kapeli/cheatset'
   spec.license       = 'MIT'

data/lib/cheatset/creator.rb

@@ -74,8 +74,18 @@ class Cheatset::Creator
       category.entries.each_with_index do |entry, index|
         if entry.command
           entry.command.each do |command|
-            db.execute(sql, command.strip, 'Command',
+            if(!command.strip.empty?)
+              db.execute(sql, command.strip, 'Command',
                        "index.html\#//dash_ref_#{category_strip}/Entry/#{URI.escape(entry.tags_stripped_name.strip).gsub(/\//, '%252F')}/0")
+            end
+          end
+        end
+        if entry.td_command
+          entry.td_command.each do |command|
+            if(!command.strip.empty?)
+              db.execute(sql, command.strip, 'Command',
+                       "index.html\#//dash_ref_#{category_strip}/Entry/#{URI.escape(entry.tags_stripped_name.strip).gsub(/\//, '%252F')}/0")
+            end
           end
         end
         if entry.name

data/lib/cheatset/dsl/cheatsheet.rb

@@ -2,7 +2,7 @@ module Cheatset
   module DSL
     class Cheatsheet < Base
       attr_reader :categories
-      define_attrs :title, :docset_file_name, :keyword, :source_url, :platform
+      define_attrs :title, :docset_file_name, :keyword, :source_url, :platform, :style
       define_markdown_attrs :introduction, :notes
 
       def initialize(&block)

data/lib/cheatset/dsl/entry.rb

@@ -1,7 +1,7 @@
 module Cheatset
   module DSL
     class Entry < Base
-      define_list_attrs :command
+      define_list_attrs :command, :td_command
       define_markdown_attrs :name, :notes
     end
   end

data/lib/cheatset/templates/style.css

@@ -75,13 +75,13 @@ table {
 td {
   padding: 13px 2px 0px 8px; }
 
-td.command {
+td.command, td.td_command {
   width: 1%;
   white-space: nowrap;
   vertical-align: top;
   padding: 9px 8px 4px 7px;
   text-align: right; }
-  td.command code {
+  td.command code, td.td_command code {
     padding: .1em 0.2em;
     box-shadow: 0 1px 0px rgba(0, 0, 0, 0.2), 0 0 0 2px white inset;
     border-radius: 3px;
@@ -89,6 +89,10 @@ td.command {
     background-color: #efefef;
     color: #333; }
 
+td.td_command {
+  text-align: center;
+  border-right: 1px solid #666666; }
+
 td.description .name {
   font-size: 1.2em; }
 

data/lib/cheatset/templates/style.scss

@@ -111,6 +111,12 @@ td.command {
   }
 }
 
+td.td_command {
+  @extend td.command;
+  text-align:center;
+  border-right: 1px solid $dark_gray;
+}
+
 td.description {
   .name {
     font-size: 1.2em;

data/lib/cheatset/templates/template.haml

@@ -4,6 +4,8 @@
     %meta{charset: 'utf-8'}
     %title= title
     %link{rel: 'stylesheet', href: 'style.css'}
+    - if style
+      %style{type: 'text/css'}= style
     - categories.each do |category|
       %link{href: "//dash_ref/Category/#{category.id.strip.gsub(/\//, '%2F')}/1"}
       - category.hasEntry(false)
@@ -35,7 +37,12 @@
                     - entry.command.each do |command|
                       %p
                         %code= CGI.escapeHTML(command)
-                %td.description{:colspan => ("2" unless entry.command)}
+                - if entry.td_command
+                  - entry.td_command.each do |command|
+                    %td.td_command
+                      - if !command.empty?
+                        %code= CGI.escapeHTML(command)
+                %td.description{:colspan => ("2" unless entry.command || entry.td_command)}
                   .name~ entry.name
                   .notes~ entry.notes
       - if notes

data/lib/cheatset/version.rb

@@ -1,3 +1,3 @@
 module Cheatset
-  VERSION = '1.1.8'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheatset
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Bogdan Popescu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Generate cheatsheets for Dash
+description: Generate cheat sheets for Dash
 email: 
 executables:
 - cheatset
@@ -201,6 +201,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Generate cheatsheets for Dash
+summary: Generate cheat sheets for Dash
 test_files: []
 has_rdoc: