corneal 0.1.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de1e4bb8d51010b773f5cfce5d71fc464c23f5d
-  data.tar.gz: fd595378a39711e548bb4cdc71ba43ee3289524a
+  metadata.gz: 5c72255b709457456984468ae88732cf41560024
+  data.tar.gz: 35dc9fb6162d07a9613bf4cf5e22a2bac58dd3bf
 SHA512:
-  metadata.gz: 484a0abe83fbb97f382d49b315ed845e1ae5b3468f9ed1a8800757f3890b7b41c209daeff0c537b681796ff0d0d79a3efc408de8c91b1cc84fd2b7c411c185a6
-  data.tar.gz: ed1673ca7c4c4bddbcae1659b154daa286963417381cb1886ce2664b15af289a8ca689442eb3ff79f6a5acf8d842d78067b401cf3aa7919771452b1baae7a5d0
+  metadata.gz: b68e2d04e08205ae6de10c4ca8db909ec6045a6faa3388ddd10aa38a88627594cd7a55b4c529852f558d5371589c3b468191ad3499ef5797881be2b654fff5fc
+  data.tar.gz: b6c5dcc630915ec6a2a5a5bd1d18038ba5bc4c491828399b6767dfdd11b1d9c9a04c1f641c1d8a5255329aebc95cc7e542a46c006dc6ba4aab1511b17c4ace28

data/README.md

@@ -10,7 +10,7 @@ When I was creating my first major Sinatra project, [Cook This Way](https://gith
 
 I also wanted to create a gem for future Learn students so they could easily get started building their projects. Although built with them in mind, this can get you off and running with any Sinatra app.
 
-Install the gem, run `corneal app-name`, run `bundle`, and you're all set! You can start up your server with `shotgun` and verify everything is working. It is as simple as that.
+Install the gem, run `corneal new app-name`, run `bundle install`, and you're all set! You can start up your server with `shotgun` and verify everything is working. It is as simple as that.
 
 It uses a file structure similar to what you would see with Rails.
 
@@ -32,9 +32,7 @@ Directory structure:
 │   ├── initializers
 │   └── environment.rb
 ├── db
-│   ├── development.sqlite
-│   ├── schema.rb
-│   └── test.sqlite
+│   └── migrate
 ├── lib
 │   └── .gitkeep
 └── public
@@ -52,29 +50,55 @@ Directory structure:
 
     gem install corneal
 
-## Configuration
+## Commands
+```
+corneal -v              # Show Corneal version number
+corneal help [COMMAND]  # Describe available commands or one specific command
+corneal model NAME      # Generate a model
+corneal new APP_PATH    # Creates a new Sinatra application
+```
 
-* `--rvm` Create .ruby-version (ruby-2.1.0) and .ruby-gemset
-* `--bundle` Run bundle after generating the app
-* `--git` Initialize a Git repository
+## Using Corneal
 
-## Example
+To generate your app:
 
-To generate your app
+    corneal new app-name
 
-    corneal app-name
+After Corneal is done generating your app, run `bundle install` from your app's directory:
 
-After Corneal is done generating an app, you can `cd` into your apps
-directory and `shotgun`
+    cd app-name
+    bundle install
 
-    cd app-name; shotgun
+You can then start your server with `shotgun`:
 
-Visit [http://localhost:9393/](http://localhost:9393/) to verify your app is running.
+    shotgun
+
+You can generate a model and migration file:
+
+    corneal model NAME
+
+You can also add your model attributes when you generate the model and have them added to your migration file:
 
-You can verify by running the included test
+    corneal model NAME name:string age:integer
+
+```
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :name
+      t.age :integer
+
+      t.timestamps null: false
+    end
+  end
+end
+```
+
+Visit [http://localhost:9393/](http://localhost:9393/) to verify your app is running.
 
-    rspec
+You can also verify it is working by running `rspec` to see the passing test:
 
+    1 example, 0 failures
 
 ## Contributing
 

data/bin/corneal

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 
-require "corneal/cli"
+require "corneal"
 
 Corneal::CLI.start

data/lib/corneal.rb

@@ -0,0 +1,9 @@
+require "extensions/string"
+require "corneal/generators/app/app_generator"
+require "corneal/generators/model/model_generator"
+require "corneal/version"
+require "corneal/cli"
+
+module Corneal
+
+end

data/lib/corneal/cli.rb

@@ -1,129 +1,22 @@
-# encoding: UTF-8
-
-require "extensions/string"
-require "thor/group"
+require "thor"
 
 module Corneal
-  class CLI < Thor::Group
-    include Thor::Actions
-
-    desc "Creates a new Sinatra application"
-    argument :name, :type => :string, :desc => "The name of the new application"
-    class_option :capistrano, :type => :boolean, :desc => "Include Capistrano configuration"
-    class_option :database, :aliases => "-d", :default => "", :desc => "The type of database to use"
-    class_option :redis, :type => :boolean, :desc => "Include Redis configuration"
-    class_option :rvm, :type => :boolean, :desc => "Create .ruby-version (ruby-2.1.0) and .ruby-gemset"
-    class_option :bundle, :type => :boolean, :desc => "Run bundle after generating the app"
-    class_option :git, :type => :boolean, :desc => "Initialize a Git repository"
-
-    # Creates instance variables from options passed to corneal.
-    def setup
-      @app_path = name.directory_name
-      @name     = name.file_name
-
-      options.each do |key, value|
-        instance_variable_set "@#{key.to_s}".to_sym, value
-      end
-    end
-
-    def self.source_root
-      File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "templates"))
-    end
-
-    # Create empty directories
-    def create_empty_directories
-      %w{config/initializers lib spec}.each do |dir|
-        empty_directory File.join(@app_path, dir)
-      end
-
-      empty_directory File.join(@app_path, 'db/migrate') unless @database.empty?
-
-      create_file File.join(@app_path, "lib", ".gitkeep")
-      template "config/environment.rb", File.join(@app_path, "config/environment.rb")
-    end
-
-    def create_public_directory
-      %w{public/stylesheets public/javascripts public/images}.each do |dir|
-        directory dir, File.join(@app_path, dir)
-      end
-
-      template "public/favicon.ico", File.join(@app_path, "public/favicon.ico")
-    end
-
-    def create_app_directory
-      %w{app/controllers app/views app/models}.each do |dir|
-        directory dir, File.join(@app_path, dir)
-      end
-    end
+  class CLI < Thor
 
-    def create_app_spec
-      template "spec/application_controller_spec.rb", File.join(@app_path, "spec/application_controller_spec.rb")
+    desc "-v", "Show Corneal version number"
+    map %w[-v --version] => :version
+    # USAGE: corneal -v
+    def version
+      say "Corneal #{Corneal::VERSION::STRING}"
     end
 
-    def create_spec_helper
-      template "spec/spec_helper.rb", File.join(@app_path, "spec/spec_helper.rb")
-    end
 
-    def create_config
-      template "config.ru", File.join(@app_path, "config.ru")
-    end
-
-    def create_gemfile
-      template "Gemfile", File.join(@app_path, "Gemfile")
-    end
-
-    def create_rakefile
-      template "Rakefile", File.join(@app_path, "Rakefile")
-    end
-
-    def create_readme
-      copy_file "README.md", File.join(@app_path, "README.md")
-    end
-
-    def create_db_config
-      template("config/db.yml", File.join(@app_path, "config/db.yml")) unless @database.empty?
-    end
-
-    def create_database_initializer
-      template("config/initializers/database.rb", File.join(@app_path, "config/initializers/database.rb")) unless @database.empty?
-    end
-
-    def create_redis_config
-      copy_file("config/redis.yml", File.join(@app_path, "config/redis.yml")) if @redis
-    end
-
-    def create_redis_initializer
-      template("config/initializers/redis.rb", File.join(@app_path, "config/initializers/redis.rb")) if @redis
-    end
-
-    def create_capistrano_config
-      if @capistrano
-        inside(@app_path) do
-          run('cap install')
-        end
-      end
-    end
-
-    def create_rvm_gemset
-      if @rvm
-        create_file(File.join(@app_path, '.ruby-version'), 'ruby-2.1.0')
-        create_file(File.join(@app_path, '.ruby-gemset'), @app_path)
-
-        @bundle = false
-        puts "You need to run 'bundle install' manually."
-      end
-    end
-
-    def initialize_git_repo
-      inside(@app_path) do
-        run('git init .') if @git
-      end
-    end
+    # register(class_name, subcommand_alias, usage_list_string, description_string)
+    register Corneal::Generators::AppGenerator, "new", "new APP_PATH", "Creates a new Sinatra application"
+    register Corneal::Generators::ModelGenerator, "model", "model NAME", "Generate a model"
 
-    def install_dependencies
-      inside(@app_path) do
-        run('bundle') if @bundle
-      end
+    def self.exit_on_failure
+      true
     end
   end
 end

data/lib/corneal/generators/app/app_generator.rb

@@ -0,0 +1,129 @@
+# encoding: UTF-8
+require "thor/group"
+
+module Corneal
+  module Generators
+    class AppGenerator < Thor::Group
+      include Thor::Actions
+
+      desc "Creates a new Sinatra application"
+      argument :name, :type => :string, :desc => "The name of the new application"
+      class_option :capistrano, :type => :boolean, :desc => "Include Capistrano configuration"
+      class_option :database, :aliases => "-d", :default => "", :desc => "The type of database to use"
+      class_option :redis, :type => :boolean, :desc => "Include Redis configuration"
+      class_option :rvm, :type => :boolean, :desc => "Create .ruby-version (ruby-2.1.0) and .ruby-gemset"
+      class_option :bundle, :type => :boolean, :desc => "Run bundle after generating the app"
+      class_option :git, :type => :boolean, :desc => "Initialize a Git repository"
+
+      # Creates instance variables from options passed to corneal.
+      def setup
+        @app_path = name.directory_name
+        @name     = name.file_name
+
+        options.each do |key, value|
+          instance_variable_set "@#{key.to_s}".to_sym, value
+        end
+      end
+
+      def self.source_root
+        File.expand_path(File.join(File.dirname(__FILE__), "templates"))
+      end
+
+      # Create empty directories
+      def create_empty_directories
+        %w{config/initializers lib spec}.each do |dir|
+          empty_directory File.join(@app_path, dir)
+        end
+
+        empty_directory File.join(@app_path, 'db/migrate')
+
+        create_file File.join(@app_path, "lib", ".gitkeep")
+        template "config/environment.rb", File.join(@app_path, "config/environment.rb")
+      end
+
+      def create_public_directory
+        %w{public/stylesheets public/javascripts public/images}.each do |dir|
+          directory dir, File.join(@app_path, dir)
+        end
+
+        template "public/favicon.ico", File.join(@app_path, "public/favicon.ico")
+      end
+
+      def create_app_directory
+        %w{app/controllers app/views app/models}.each do |dir|
+          directory dir, File.join(@app_path, dir)
+        end
+      end
+
+      def create_app_spec
+        template "spec/application_controller_spec.rb", File.join(@app_path, "spec/application_controller_spec.rb")
+      end
+
+      def create_spec_helper
+        template "spec/spec_helper.rb", File.join(@app_path, "spec/spec_helper.rb")
+      end
+
+      def create_config
+        template "config.ru", File.join(@app_path, "config.ru")
+      end
+
+      def create_gemfile
+        template "Gemfile", File.join(@app_path, "Gemfile")
+      end
+
+      def create_rakefile
+        template "Rakefile", File.join(@app_path, "Rakefile")
+      end
+
+      def create_readme
+        copy_file "README.md", File.join(@app_path, "README.md")
+      end
+
+      def create_db_config
+        template("config/db.yml", File.join(@app_path, "config/db.yml")) unless @database.empty?
+      end
+
+      def create_database_initializer
+        template("config/initializers/database.rb", File.join(@app_path, "config/initializers/database.rb")) unless @database.empty?
+      end
+
+      def create_redis_config
+        copy_file("config/redis.yml", File.join(@app_path, "config/redis.yml")) if @redis
+      end
+
+      def create_redis_initializer
+        template("config/initializers/redis.rb", File.join(@app_path, "config/initializers/redis.rb")) if @redis
+      end
+
+      def create_capistrano_config
+        if @capistrano
+          inside(@app_path) do
+            run('cap install')
+          end
+        end
+      end
+
+      def create_rvm_gemset
+        if @rvm
+          create_file(File.join(@app_path, '.ruby-version'), 'ruby-2.1.0')
+          create_file(File.join(@app_path, '.ruby-gemset'), @app_path)
+
+          @bundle = false
+          puts "You need to run 'bundle install' manually."
+        end
+      end
+
+      def initialize_git_repo
+        inside(@app_path) do
+          run('git init .') if @git
+        end
+      end
+
+      def install_dependencies
+        inside(@app_path) do
+          run('bundle') if @bundle
+        end
+      end
+    end
+  end
+end

data/lib/corneal/generators/model/migration.rb.erb

@@ -0,0 +1,10 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def change
+    create_table :<%= table_name %> do |t|
+<% attributes.each do |attribute| -%>
+      t.<%= attribute[:type] %> :<%= attribute[:name] %>
+<% end %>
+      t.timestamps null: false
+    end
+  end
+end

data/lib/corneal/generators/model/model.rb.erb

@@ -0,0 +1,2 @@
+class <%= class_name %> < ActiveRecord::Base
+end

data/lib/corneal/generators/model/model_generator.rb

@@ -0,0 +1,58 @@
+require "thor/group"
+require 'active_support/inflector'
+
+module Corneal
+  module Generators
+    class ModelGenerator < Thor::Group
+      include Thor::Actions
+      attr_reader :file_name, :class_name, :model_name, :migration_name, :migration_class_name, :table_name
+
+      desc "Generate an ActiveRecord model"
+      argument :name, :type => :string, :desc => "Name of the model"
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+      class_option :migration, type: :boolean, default: true, desc: "Generate migration for model"
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def setup
+        @model_name           = name.singularize
+        @class_name           = model_name.camel_case
+        @file_name            = model_name.file_name
+        @table_name           = @file_name.pluralize
+        @migration_name       = "create_#{@table_name}"
+        @migration_class_name = @migration_name.camel_case
+
+        attributes.map! do |attribute|
+          field = attribute.split(":")
+          { name: field[0], type: (field[1] || "string") }
+        end
+      end
+
+      def create_model
+        unless model_name == name
+          say "[WARNING] The model name '#{name}' was recognized as a plural, using the singular '#{model_name}' instead."
+        end
+
+        template "model.rb.erb", File.join("app/models", "#{file_name}.rb")
+      end
+
+      def create_migration
+        return unless options[:migration]
+        
+        migration_files = Dir.entries("db/migrate").select { |path| !File.directory? path }
+
+        if duplicate = migration_files.find { |file| file.include?(migration_name) }
+          say_status :identical, "db/migrate/#{duplicate}", :blue
+        else
+          version = Time.now.utc.strftime("%Y%m%d%H%M%S")
+          migration_file_name = "#{version}_#{migration_name}.rb"
+
+          template "migration.rb.erb", File.join("db/migrate", migration_file_name)
+        end
+      end
+    end
+  end
+end

data/lib/corneal/version.rb

@@ -1,8 +1,8 @@
 module Corneal
   module VERSION
-    MAJOR = 0
-    MINOR = 1
-    TINY  = 5
+    MAJOR = 1
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/corneal/cli_spec.rb

@@ -1,14 +1,14 @@
 require 'fakefs'
 require_relative "../spec_helper"
-require_relative "../../lib/corneal/cli"
+require_relative "../../lib/corneal"
 
 describe Corneal::VERSION do
-  subject { Corneal::CLI }
+  subject { Corneal::Generators::AppGenerator }
 
   describe "source_root" do
     it "should return with a full path" do
       pwd           = File.dirname(__FILE__)
-      template_path = pwd.sub 'spec/corneal', 'lib/templates'
+      template_path = pwd.sub 'spec/corneal', 'lib/corneal/generators/app/templates'
       subject.source_root.must_equal template_path
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corneal
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Brian Emory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -71,29 +85,34 @@ files:
 - README.md
 - Rakefile
 - bin/corneal
+- lib/corneal.rb
 - lib/corneal/cli.rb
+- lib/corneal/generators/app/app_generator.rb
+- lib/corneal/generators/app/templates/Gemfile
+- lib/corneal/generators/app/templates/README.md
+- lib/corneal/generators/app/templates/Rakefile
+- lib/corneal/generators/app/templates/app/controllers/application_controller.rb
+- lib/corneal/generators/app/templates/app/models/.gitkeep
+- lib/corneal/generators/app/templates/app/views/layout.erb.tt
+- lib/corneal/generators/app/templates/app/views/welcome.erb
+- lib/corneal/generators/app/templates/config.ru
+- lib/corneal/generators/app/templates/config/db.yml
+- lib/corneal/generators/app/templates/config/environment.rb
+- lib/corneal/generators/app/templates/config/initializers/database.rb
+- lib/corneal/generators/app/templates/config/initializers/redis.rb
+- lib/corneal/generators/app/templates/config/redis.yml
+- lib/corneal/generators/app/templates/public/favicon.ico
+- lib/corneal/generators/app/templates/public/images/.gitkeep
+- lib/corneal/generators/app/templates/public/images/corneal-small.png
+- lib/corneal/generators/app/templates/public/javascripts/.gitkeep
+- lib/corneal/generators/app/templates/public/stylesheets/main.css
+- lib/corneal/generators/app/templates/spec/application_controller_spec.rb
+- lib/corneal/generators/app/templates/spec/spec_helper.rb
+- lib/corneal/generators/model/migration.rb.erb
+- lib/corneal/generators/model/model.rb.erb
+- lib/corneal/generators/model/model_generator.rb
 - lib/corneal/version.rb
 - lib/extensions/string.rb
-- lib/templates/Gemfile
-- lib/templates/README.md
-- lib/templates/Rakefile
-- lib/templates/app/controllers/application_controller.rb
-- lib/templates/app/models/.gitkeep
-- lib/templates/app/views/layout.erb.tt
-- lib/templates/app/views/welcome.erb
-- lib/templates/config.ru
-- lib/templates/config/db.yml
-- lib/templates/config/environment.rb
-- lib/templates/config/initializers/database.rb
-- lib/templates/config/initializers/redis.rb
-- lib/templates/config/redis.yml
-- lib/templates/public/favicon.ico
-- lib/templates/public/images/.gitkeep
-- lib/templates/public/images/corneal-small.png
-- lib/templates/public/javascripts/.gitkeep
-- lib/templates/public/stylesheets/main.css
-- lib/templates/spec/application_controller_spec.rb
-- lib/templates/spec/spec_helper.rb
 - spec/corneal/cli_spec.rb
 - spec/corneal/version_spec.rb
 - spec/spec_helper.rb