decko 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b94c35fd180b5479716cabe574dd3b998df9d877
-  data.tar.gz: 634fc3255968442d83caeb5afb425214c139f634
+  metadata.gz: f48487297bc2a5118ffb88d04fefe2863916db81
+  data.tar.gz: 86645e8fe4e9386172c4956b297f4c74610b1d60
 SHA512:
-  metadata.gz: 84cf1356f399efb815b8c3e9bfdacd63621a297fcf9758d398a8da807b7de05176ef6e2ec561b366f34dc91600b99681143e9729dca4232baca1ca9fa95b15e2
-  data.tar.gz: b67a2f9be5f2d1d4a405a39046dff9ac853c5eb3d91f68315c035e76e627d826f7049844795f2712a9d70509c9b599999b45a3927004074035ede9ed0cd1c19b
+  metadata.gz: e131a22804e399150bbaa8c7d24ec6d63a1bb12e25d3a0d654bdc3422d5dcf49f70ae4c5b32b17291c30777b83e20eda6c6c54320cda2fb2bbf991ebabdcf0f5
+  data.tar.gz: b6c38c72fa9e839263debb2973c708645f11da99bdd5fabc983612c997a4ad09dff62457ca0af771b74b8444cf089024fc8895c5896030342479ecf1ecb924a1

data/README.rdoc

@@ -28,29 +28,44 @@ ImageMagick[http://www.imagemagick.org/]::
 A database engine:: Either MySQL[http://www.mysql.com/] or PostgreSQL[http://www.postgresql.org/]
 A JavaScript runtime::  Node.js[https://nodejs.org/] or other[https://github.com/sstephenson/execjs]
 
-===1. install the gem
+===2. install the gem
 
- gem install decko
+    gem install decko
 
 Watch carefully for errors!
 
 
-===2. create a new deck
+===3. create a new deck
 
-  decko new _mysite_
+    decko new MY_DECK
 
+Options:
+    -f, [--force]                            # Overwrite files that already exist
+    -p, [--pretend], [--no-pretend]          # Run but do not make any changes
+    -q, [--quiet], [--no-quiet]              # Suppress status output
+    -s, [--skip], [--no-skip]                # Skip files that already exist
+    -m, [--mod-dev], [--no-mod-dev]          # Prepare deck for mod development
+    -c, [--core-dev], [--no-core-dev]        # Prepare deck for core development
+    -g, [--gem-path=GEM-PATH]                # Path to local decko repository (Default, use env DECKO_GEM_PATH)
+    -i, [--interactive], [--no-interactive]  # Prompt with dynamic installation options
 
-===3. create / seed database
+===4. create / seed database
 
-Edit the config/database.yml file as necessary. More about database configuration at http://www.wagn.org/database_configuration.
+Edit the config/database.yml file as necessary. More about database configuration at https://www.decko.org/database_configuration.
 
 Then run
 
-  cd _mysite_
-  decko seed
+      cd MY_DECK
+      decko seed
 
 ..to create and seed the database
 
+Options:
+    -p, --production                 decko:seed production database (default)
+    -t, --test                       decko:seed test database
+    -d, --development                decko:seed development database
+    -a, --all                        decko:seed production, test, and development database
+
 
 ===4. start your server
 
@@ -60,7 +75,16 @@ To fire up the default, built-in WEBrick server, just run:
 
 ...and point your browser to http://localhost:3000 (unless otherwise configured).
 
-For more information, see http://wagn.org/get_started.
+Options:
+  -p, [--port=port]                        # Runs Decko on the specified port - defaults to 3000.
+  -b, [--binding=IP]                       # Binds Decko to the specified IP - defaults to 'localhost' in development and '0.0.0.0' in other environments'.
+  -c, [--config=file]                      # Uses a custom rackup configuration. (default: config.ru)
+  -d, [--daemon], [--no-daemon]            # Runs server as a Daemon.
+  -e, [--environment=name]                 # Specifies the environment to run this server under (development/test/production).
+  -P, [--pid=PID]                          # Specifies the PID file. (efault: tmp/pids/server.pid)
+      [--early-hints], [--no-early-hints]  # Enables HTTP/2 early hints.
+
+For more information, see https://decko.org/get_started.
 
 
 
@@ -118,10 +142,10 @@ First update your Wagn to version 1.10 via the old update mechanisms, and then f
 
 ==More Resources
 
-If you're new to Decko, you'll find lots more info at http://wagn.org
+If you're new to Decko, you'll find lots more info at https://decko.org
 
-Installation problems? Installation: http://wagn.org/installation
+Installation problems? Installation: https://decko.org/installation
 
 If you're looking to go deep into the code, start with http://www.rubydoc.info/gems/card
 
-Thinking about contributing (troubleshooting) to Wagn? here[link:CONTRIBUTING.rdoc]
+Thinking about contributing to Decko? here[link:CONTRIBUTING.rdoc]

data/lib/decko/generators/decko/decko_generator.rb

@@ -5,23 +5,23 @@ class DeckoGenerator < Rails::Generators::AppBase
 
   source_root File.expand_path("../templates", __FILE__)
 
-  class_option :database,
-               type: :string, aliases: "-d", default: "mysql",
-               desc: "Preconfigure for selected database " \
-                     "(options: #{DATABASES.join('/')})"
+  class_option "mod-dev",
+               type: :boolean, aliases: "-m", default: false, group: :runtime,
+               desc: "Prepare deck for mod development"
 
   class_option "core-dev",
                type: :boolean, aliases: "-c", default: false, group: :runtime,
-               desc: "Prepare deck for decko core testing"
+               desc: "Prepare deck for core development"
 
   class_option "gem-path",
                type: :string, aliases: "-g", default: "", group: :runtime,
                desc: "Path to local decko repository " \
                      "(Default, use env DECKO_GEM_PATH)"
 
-  class_option "mod-dev",
-               type: :boolean, aliases: "-m", default: false, group: :runtime,
-               desc: "Prepare deck for mod testing"
+  class_option :database,
+               type: :string, aliases: "-d", default: "mysql",
+               desc: "Preconfigure for selected database " \
+                     "(options: #{DATABASES.join('/')})"
 
   class_option "interactive",
                type: :boolean, aliases: "-i", default: false, group: :runtime,
@@ -33,22 +33,12 @@ class DeckoGenerator < Rails::Generators::AppBase
   ## should probably eventually use rails-like AppBuilder approach,
   # but this is a first step.
   def dev_setup
-    # TODO: rename or split, gem_path points to the source repo,
-    # card and decko gems are subdirs
-    @gemfile_gem_path = @gem_path = options["gem-path"]
-    env_gem_path = ENV["DECKO_GEM_PATH"]
-    if env_gem_path.present?
-      @gemfile_gem_path = %q(#{ENV['DECKO_GEM_PATH']})
-      @gem_path = env_gem_path
-    end
-
+    determine_gemfile_gem_path
     @include_jasmine_engine = false
     if options["core-dev"]
       core_dev_setup
-      shared_dev_setup
     elsif options["mod-dev"]
       mod_dev_setup
-      shared_dev_setup
     end
   end
 
@@ -147,43 +137,56 @@ class DeckoGenerator < Rails::Generators::AppBase
 
   protected
 
-  def core_dev_setup
-    if @gem_path.blank?
-      @gemfile_gem_path =
-        @gem_path = ask("Enter the path to your local decko gem installation: ")
+  def determine_gemfile_gem_path
+    # TODO: rename or split, gem_path points to the source repo,
+    # card and decko gems are subdirs
+    if (env_gem_path = ENV["DECKO_GEM_PATH"]).present?
+      @gemfile_gem_path = %q(#{ENV['DECKO_GEM_PATH']})
+      @gem_path = env_gem_path
+    else
+      @gemfile_gem_path = @gem_path = options["gem-path"]
     end
+  end
 
+  def core_dev_setup
+    prompt_for_gem_path
     @include_jasmine_engine = true
     @spec_path = @gem_path
     @spec_helper_path = File.join @spec_path, "card", "spec", "spec_helper"
-    empty_directory "spec"
-
-    @cardio_gem_root = File.join @gem_path, "card"
-    @decko_gem_root = File.join @gem_path, "decko"
-    inside "spec" do
-      template File.join("javascripts", "support", "decko_jasmine.yml"),
-               File.join("javascripts", "support", "jasmine.yml")
-    end
 
     # ending slash is important in order to load support and step folders
     @features_path = File.join @gem_path, "decko/features/"
-
     @simplecov_config = "card_core_dev_simplecov_filters"
+    shared_dev_setup
+    javascript_spec_setup "decko_jasmine"
+  end
+
+  def prompt_for_gem_path
+    return if @gem_path.present?
+    @gemfile_gem_path =
+      @gem_path = ask("Enter the path to your local decko gem installation: ")
   end
 
   def mod_dev_setup
     @spec_path = "mod/"
     @spec_helper_path = "./spec/spec_helper"
     @simplecov_config = "card_simplecov_filters"
-    empty_directory "spec"
+    shared_dev_setup
+    inside("spec") { template "spec_helper.rb" }
+    javascript_spec_setup "deck_jasmine"
+  end
+
+  def javascript_spec_setup jasmine_prefix
     inside "spec" do
-      template "spec_helper.rb"
-      template File.join("javascripts", "support", "deck_jasmine.yml"),
+      template File.join("javascripts", "support", "#{jasmine_prefix}.yml"),
                File.join("javascripts", "support", "jasmine.yml")
     end
   end
 
   def shared_dev_setup
+    @cardio_gem_root = File.join @gem_path, "card"
+    @decko_gem_root = File.join @gem_path, "decko"
+    empty_directory "spec"
     template "rspec", ".rspec"
     template "simplecov", ".simplecov"
     empty_directory "bin"

data/lib/decko/generators/decko/templates/spec/javascripts/support/deck_jasmine.yml

@@ -28,7 +28,7 @@ css_files:
     # - "**/*.{css,scss}"
 # THIS IS IMPORTANT!!
 include_dir: "mod"
-  #- <%= Cardio.gem_root+"/mod/machines/lib/javascript" %>
+  #- <%= @cardio_gem_root+"/mod/machines/lib/javascript" %>
 # path to parent directory of spec_files
 # relative path from Rails.root
 #

data/lib/decko/tasks/decko.rake

@@ -95,12 +95,23 @@ decko_namespace = namespace :decko do
   end
 
   desc "set symlink for assets"
-  task :update_assets_symlink do
+  task update_assets_symlink: :environment do
+    prepped_asset_path do |assets_path|
+      Card::Mod.dirs.each_assets_path do |mod, target|
+        link = File.join assets_path, mod
+        FileUtils.ln_s target, link, force: true
+      end
+    end
+  end
+
+  def prepped_asset_path
     return if Rails.root.to_s == Decko.gem_root # inside decko gem
     assets_path = File.join Rails.public_path, "assets"
-    FileUtils.rm assets_path if File.symlink? assets_path
-    return if File.exist? assets_path # could not clean. make more noise?
-    FileUtils.ln_s Decko::Engine.paths["gem-assets"].first, assets_path
+    if File.symlink?(assets_path) || !File.directory?(assets_path)
+      FileUtils.rm_rf assets_path
+      FileUtils.mkdir assets_path
+    end
+    yield assets_path
   end
 
   alias_task :migrate, "card:migrate"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.95.1
+        version: 1.95.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.95.1
+        version: 1.95.2
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -120,148 +120,11 @@ files:
 - lib/decko/tasks/decko.rake
 - lib/decko/tasks/decko/seed.rake
 - rails/application-routes.rb
-- rails/assets/ace/ext-searchbox.js
-- rails/assets/ace/mode-coffee.js
-- rails/assets/ace/mode-css.js
-- rails/assets/ace/mode-html.js
-- rails/assets/ace/mode-javascript.js
-- rails/assets/ace/mode-json.js
-- rails/assets/ace/mode-latex.js
-- rails/assets/ace/mode-scss.js
-- rails/assets/ace/theme-github.js
-- rails/assets/ace/theme-textmate.js
-- rails/assets/ace/worker-coffee.js
-- rails/assets/ace/worker-css.js
-- rails/assets/ace/worker-html.js
-- rails/assets/ace/worker-javascript.js
-- rails/assets/ace/worker-json.js
-- rails/assets/body-bg-660b752b44b87594071f3d0851ac5360.png
-- rails/assets/body-bg-d031f29b6ba7399a6862382c3552f44c.bmp
-- rails/assets/body-bg.bmp
-- rails/assets/body-bg.png
-- rails/assets/external_link-b15ab5051b4ec6f32892ed80019405b5.png
 - rails/assets/external_link.png
-- rails/assets/fonts/FontAwesome.otf
-- rails/assets/fonts/MaterialIcons-Regular.eot
-- rails/assets/fonts/MaterialIcons-Regular.ijmap
-- rails/assets/fonts/MaterialIcons-Regular.svg
-- rails/assets/fonts/MaterialIcons-Regular.ttf
-- rails/assets/fonts/MaterialIcons-Regular.woff
-- rails/assets/fonts/MaterialIcons-Regular.woff2
-- rails/assets/fonts/fontawesome-webfont.eot
-- rails/assets/fonts/fontawesome-webfont.svg
-- rails/assets/fonts/fontawesome-webfont.ttf
-- rails/assets/fonts/fontawesome-webfont.woff
-- rails/assets/fonts/fontawesome-webfont.woff2
-- rails/assets/fonts/glyphicons-halflings-regular.eot
-- rails/assets/fonts/glyphicons-halflings-regular.svg
-- rails/assets/fonts/glyphicons-halflings-regular.ttf
-- rails/assets/fonts/glyphicons-halflings-regular.woff
-- rails/assets/fonts/glyphicons-halflings-regular.woff2
 - rails/assets/jasmine/404.html
 - rails/assets/jasmine/500.html
 - rails/assets/jasmine/card_form.html
-- rails/assets/jquery-ui-smoothness/ui-bg_glass_55_fbf9ee_1x400.png
-- rails/assets/jquery-ui-smoothness/ui-bg_glass_65_ffffff_1x400.png
-- rails/assets/jquery-ui-smoothness/ui-bg_glass_75_dadada_1x400.png
-- rails/assets/jquery-ui-smoothness/ui-bg_glass_75_e6e6e6_1x400.png
-- rails/assets/jquery-ui-smoothness/ui-bg_glass_95_fef1ec_1x400.png
-- rails/assets/jquery-ui-smoothness/ui-bg_highlight-soft_75_cccccc_1x100.png
-- rails/assets/jquery-ui-smoothness/ui-icons_222222_256x240.png
-- rails/assets/jquery-ui-smoothness/ui-icons_2e83ff_256x240.png
-- rails/assets/jquery-ui-smoothness/ui-icons_454545_256x240.png
-- rails/assets/jquery-ui-smoothness/ui-icons_888888_256x240.png
-- rails/assets/jquery-ui-smoothness/ui-icons_cd0a0a_256x240.png
-- rails/assets/jquery.min-388372ef65cc311f6a3df4a6ceac8d22.map
 - rails/assets/jquery.min.map
-- rails/assets/manifest.yml
-- rails/assets/tinymce/jquery.tinymce.min.js
-- rails/assets/tinymce/langs/readme.md
-- rails/assets/tinymce/license.txt
-- rails/assets/tinymce/plugins/advlist/plugin.min.js
-- rails/assets/tinymce/plugins/anchor/plugin.min.js
-- rails/assets/tinymce/plugins/autolink/plugin.min.js
-- rails/assets/tinymce/plugins/autoresize/plugin.min.js
-- rails/assets/tinymce/plugins/autosave/plugin.min.js
-- rails/assets/tinymce/plugins/bbcode/plugin.min.js
-- rails/assets/tinymce/plugins/charmap/plugin.min.js
-- rails/assets/tinymce/plugins/code/plugin.min.js
-- rails/assets/tinymce/plugins/codesample/css/prism.css
-- rails/assets/tinymce/plugins/codesample/plugin.min.js
-- rails/assets/tinymce/plugins/colorpicker/plugin.min.js
-- rails/assets/tinymce/plugins/contextmenu/plugin.min.js
-- rails/assets/tinymce/plugins/directionality/plugin.min.js
-- rails/assets/tinymce/plugins/emoticons/img/smiley-cool.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-cry.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-embarassed.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-frown.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-innocent.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-kiss.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-laughing.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-sealed.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-smile.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-surprised.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-undecided.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-wink.gif
-- rails/assets/tinymce/plugins/emoticons/img/smiley-yell.gif
-- rails/assets/tinymce/plugins/emoticons/plugin.min.js
-- rails/assets/tinymce/plugins/fullpage/plugin.min.js
-- rails/assets/tinymce/plugins/fullscreen/plugin.min.js
-- rails/assets/tinymce/plugins/help/img/logo.png
-- rails/assets/tinymce/plugins/help/plugin.min.js
-- rails/assets/tinymce/plugins/hr/plugin.min.js
-- rails/assets/tinymce/plugins/image/plugin.min.js
-- rails/assets/tinymce/plugins/imagetools/plugin.min.js
-- rails/assets/tinymce/plugins/importcss/plugin.min.js
-- rails/assets/tinymce/plugins/insertdatetime/plugin.min.js
-- rails/assets/tinymce/plugins/legacyoutput/plugin.min.js
-- rails/assets/tinymce/plugins/link/plugin.min.js
-- rails/assets/tinymce/plugins/lists/plugin.min.js
-- rails/assets/tinymce/plugins/media/plugin.min.js
-- rails/assets/tinymce/plugins/nonbreaking/plugin.min.js
-- rails/assets/tinymce/plugins/noneditable/plugin.min.js
-- rails/assets/tinymce/plugins/pagebreak/plugin.min.js
-- rails/assets/tinymce/plugins/paste/plugin.min.js
-- rails/assets/tinymce/plugins/preview/plugin.min.js
-- rails/assets/tinymce/plugins/print/plugin.min.js
-- rails/assets/tinymce/plugins/save/plugin.min.js
-- rails/assets/tinymce/plugins/searchreplace/plugin.min.js
-- rails/assets/tinymce/plugins/spellchecker/plugin.min.js
-- rails/assets/tinymce/plugins/tabfocus/plugin.min.js
-- rails/assets/tinymce/plugins/table/plugin.min.js
-- rails/assets/tinymce/plugins/template/plugin.min.js
-- rails/assets/tinymce/plugins/textcolor/plugin.min.js
-- rails/assets/tinymce/plugins/textpattern/plugin.min.js
-- rails/assets/tinymce/plugins/toc/plugin.min.js
-- rails/assets/tinymce/plugins/visualblocks/css/visualblocks.css
-- rails/assets/tinymce/plugins/visualblocks/plugin.min.js
-- rails/assets/tinymce/plugins/visualchars/plugin.min.js
-- rails/assets/tinymce/plugins/wordcount/plugin.min.js
-- rails/assets/tinymce/skins/lightgray/content.inline.min.css
-- rails/assets/tinymce/skins/lightgray/content.min.css
-- rails/assets/tinymce/skins/lightgray/content.mobile.min.css
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce-mobile.woff
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce-small.eot
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce-small.svg
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce-small.ttf
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce-small.woff
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce.eot
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce.svg
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce.ttf
-- rails/assets/tinymce/skins/lightgray/fonts/tinymce.woff
-- rails/assets/tinymce/skins/lightgray/img/anchor.gif
-- rails/assets/tinymce/skins/lightgray/img/loader.gif
-- rails/assets/tinymce/skins/lightgray/img/object.gif
-- rails/assets/tinymce/skins/lightgray/img/trans.gif
-- rails/assets/tinymce/skins/lightgray/skin.min.css
-- rails/assets/tinymce/skins/lightgray/skin.mobile.min.css
-- rails/assets/tinymce/themes/inlite/theme.min.js
-- rails/assets/tinymce/themes/mobile/theme.min.js
-- rails/assets/tinymce/themes/modern/theme.min.js
-- rails/assets/tinymce/tinymce.min.js
 - rails/controllers/card_controller.rb
 - rails/engine-routes.rb
 - script/autospec