flutterby 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8438d486194b75c4d7c37e0d51e5e4d949aa2d4
-  data.tar.gz: 7f891d43de77ce1fa2eed359c473fcc10c4aa09d
+  metadata.gz: 9ccb62d508ea34d12c5ba0097e3271660c33328f
+  data.tar.gz: 904f87548e0650145e4d0bfc3e9730d1ed7c4d1d
 SHA512:
-  metadata.gz: 135f43dbdb37de7ce5b0af32d10ddfd41fbec100101c3a91847fdc5850b66093e4da017d289a739cf8f9e755b760280e86bec50330509724f4869e20f1637e52
-  data.tar.gz: 994e263ce40ddcf2cd2db3b9c508316287ff5c5931320dad4dc8c7d03bc694c79e39b0ca5c368269d3e1b9265a00f41fb31fab46c9b0e8c0833cf44776329b07
+  metadata.gz: 4efe2bbdf68b2ca464cc04c28d6e1383fad9cfa8713669c8707816c08292bf1b843e8cdcc05aab7351449c16bb5e454c1bcf697a9616508b63205c007a3690d8
+  data.tar.gz: f2601a22b7170d99ef74af24c0d86a94c431334bd1e540f80ac06f61e79ca203ca4d1f1b28eb9a505a5d091517704aa9bbce20305e20719c77c73a59874760dd

data/flutterby.gemspec

@@ -28,7 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'gem-release', '~> 0'
   spec.add_development_dependency 'pry', '~> 0.10'
 
-  spec.add_dependency 'commander', '~> 4.4'
+  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'highline', '~> 1.7'
   spec.add_dependency 'slodown', '~> 0.3'
   spec.add_dependency 'builder', '~> 3.2'
   spec.add_dependency 'sass', '~> 3.4'

data/lib/flutterby/cli.rb

@@ -2,26 +2,22 @@ require 'flutterby'
 require 'flutterby/exporter'
 require "flutterby/server"
 
-require 'commander'
+require 'thor'
+require 'thor/group'
+require 'highline/import'
 require 'benchmark'
 
 Flutterby.logger.level = Logger::INFO
 
-Commander.configure do
-  program :name, 'Flutterby'
-  program :version, Flutterby::VERSION
-  program :description, 'There are many static site generators. This one is mine.'
+module Flutterby
+  class CLI < Thor
+    include Thor::Actions
 
-  command :build do |c|
-    c.syntax = 'flutterby build [options]'
-    c.description = "Build your website."
-
-    c.option '--in DIR', String, "Directory containing your source files"
-    c.option '--out DIR', String, "Target directory"
-
-    c.action do |args, options|
-      options.default in: "./site/", out: "./_build/"
+    desc "build", "Build your static site"
+    option :in, default: "./site/", aliases: [:i]
+    option :out, default: "./_build/", aliases: [:o]
 
+    def build
       # Simplify logger output
       Flutterby.logger.formatter = proc do |severity, datetime, progname, msg|
         " • #{msg}\n"
@@ -41,19 +37,13 @@ Commander.configure do
 
       say color("✅  Done. (took #{sprintf "%.2f", time}s)", :green, :bold)
     end
-  end
-  alias_command :b, :build
-
-  command :serve do |c|
-    c.syntax = 'flutterby serve [options]'
-    c.description = "Serve your website for development."
 
-    c.option '--in DIR', String, "Directory containing your source files"
-    c.option '--port NUM', String, "Port to serve on (default: 4004)"
 
-    c.action do |args, options|
-      options.default in: "./site/", port: 4004
+    desc "serve", "Serve your site locally"
+    option :in, default: "./site/", aliases: [:i]
+    option :port, default: 4004, aliases: [:p], type: :numeric
 
+    def serve
       say color("📚  Importing site...", :bold)
       root = Flutterby::Node.new("/", fs_path: options.in)
       root.stage!
@@ -63,7 +53,32 @@ Commander.configure do
       server = Flutterby::Server.new(root, port: options.port)
       server.run!
     end
+
+
+    desc "new PATH", "Create a new Flutterby project"
+    def new(path)
+      path = File.expand_path(path)
+      self.destination_root = path
+
+      say color("🦋  Creating a new Flutterby project in #{path}...", :bold)
+      directory("new_project", path)
+      in_root do
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
+      end
+    end
+
+    private
+
+    def color(*args)
+      $terminal.color(*args)
+    end
+
+    def self.source_root
+      File.expand_path("../templates/", File.dirname(__FILE__))
+    end
   end
-  alias_command :server, :serve
-  alias_command :s, :serve
 end
+
+Flutterby::CLI.start(ARGV)

data/lib/flutterby/version.rb

@@ -1,3 +1,3 @@
 module Flutterby
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/lib/templates/new_project/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+gem "flutterby"
+# gem "flutterby-coffeescript"

data/lib/templates/new_project/site/_layout.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>My Site</title>
+    <link rel="stylesheet" href="/css/styles.css">
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/lib/templates/new_project/site/css/styles.css.scss

@@ -0,0 +1 @@
+/* add your SCSS here */

data/lib/templates/new_project/site/index.html.md

@@ -0,0 +1,3 @@
+# Hi!
+
+This is my new website!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flutterby
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Hendrik Mans
@@ -95,19 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: slodown
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +277,10 @@ files:
 - lib/flutterby/server.rb
 - lib/flutterby/version.rb
 - lib/flutterby/view.rb
+- lib/templates/new_project/Gemfile
+- lib/templates/new_project/site/_layout.erb
+- lib/templates/new_project/site/css/styles.css.scss
+- lib/templates/new_project/site/index.html.md
 homepage: https://github.com/hmans/flutterby
 licenses:
 - MIT