singu 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a5dfec4762cf237d2d3326a9aeae5d47910e908
-  data.tar.gz: 9c1e37b8bf4c009da199f114d6ee38a1d1b5fd63
+  metadata.gz: ff409e0fdfc205d823e99c55b8c5351383e0ca59
+  data.tar.gz: e09c6ba5c02d05a52e3b2b28cacd65ba54ca78a7
 SHA512:
-  metadata.gz: 8f38b0361a488b72dad0b7d7dcdcfdfc4c75f1aa17dcc126f19dd21d04a4a41b36bfaeb8b739196f313b88d36af4d929d5e26b05c1dc342f0089d517ffc89ffa
-  data.tar.gz: 80272cb9dd97e40d199fd36974a75560e90a9f4b02aacb71d9bd7b945803f922e1a64b8a10dd7b114d8546c473a64359d86ed9dca4df028faae009c729390680
+  metadata.gz: bb0d0d8f58ac8682da6b4f4dfc330b9bca84d6e8a500294f76f1f15fbfe983b0371ac8094dd3068769b93e8b24f0103a502a7c796a4afb03d3c81620bed73cb2
+  data.tar.gz: 1ac87d6c4b05a57680356ebd12046f7bf0fa3464013eeb1da52b3c0870166a42de4a26dfc631a9ccd9161b9426d9004bc69ee951ea5f009b2ea309c81c60f399

data/README.md

@@ -30,10 +30,18 @@ open http://0.0.0.0:9292
 ```
 
 ## Possible options
+* --gems [array] => add following gems to Gemfile and install them
 ```
-# --gems [array] => add following gems to Gemfile and install them
 singu [your_app_name] --gems haml pry
 ```
+* --skip-angular [boolean] => don't append client dir with base angular app
+```
+singu [your_app_name] --skip-angular=true
+```
+* --template [hash] => install sinatra and angular apps from external github repos
+```
+singu [your_app_name] --template sinatra:regedarek.singu-custom-sinatra-app angular:regedarek/singu-custom-angular-app
+```
 
 ## Application Structure
 

data/lib/singu/cli.rb

@@ -8,6 +8,9 @@ module Singu
   class CLI < Thor::Group
     include Thor::Actions
 
+    DEFAULT_SINATRA_TEMPLATE_REPO = 'regedarek/singu-sinatra-template'
+    DEFAULT_ANGULAR_TEMPLATE_REPO = 'regedarek/singu-angular-template'
+
     def self.source_root
       File.expand_path('../../../templates', __FILE__)
     end
@@ -15,22 +18,23 @@ module Singu
     desc "Creates a new Sinatra + Angular.js application"
     argument :name, type: :string, desc: "The name of the new application"
     class_option :gems, type: :array, description: "The names of gems you want to add to the new application"
+    class_option :template, type: :hash, description: "The github repo ex: regedarek/skeleton", enum: 2
+    class_option :'skip-angular', :type => :boolean
 
     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 create_sinatra_app
-      directory 'sinatra', @app_path
+      # options.each do |key, value|
+      #   instance_variable_set "@#{key.to_s}".to_sym, value
+      # end
     end
 
-    def create_angular_app
-      directory 'angular', @app_path
+    def create_app_from_template
+      sinatra_repo = options[:template].fetch('sinatra', DEFAULT_SINATRA_TEMPLATE_REPO)
+      angular_repo = options[:template].fetch('angular', DEFAULT_ANGULAR_TEMPLATE_REPO)
+      clone_repo(sinatra_repo)
+      clone_repo(angular_repo) unless options[:'skip-angular']
     end
 
     def initialize_git_repo
@@ -44,5 +48,13 @@ module Singu
         run('bundle')
       end
     end
+
+    private
+
+    def clone_repo(repo)
+      repo_name = repo.split('/').last
+      system "git clone -q --depth 1 git@github.com:#{repo}.git templates/#{repo_name}"
+      directory repo_name, @app_path
+    end
   end
 end

data/lib/singu/version.rb

@@ -1,3 +1,3 @@
 module Singu
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Darek Finster
@@ -240,21 +240,6 @@ files:
 - singu.gemspec
 - spec/singu_spec.rb
 - spec/spec_helper.rb
-- templates/angular/client/Gruntfile.js
-- templates/angular/client/app/index.html
-- templates/angular/client/package.json
-- templates/sinatra/.gitignore
-- templates/sinatra/Gemfile.tt
-- templates/sinatra/Procfile
-- templates/sinatra/Rakefile
-- templates/sinatra/app.rb.tt
-- templates/sinatra/app/lib/db.rb.tt
-- templates/sinatra/app/models.rb.tt
-- templates/sinatra/app/models/.gitkeep
-- templates/sinatra/app/routes.rb.tt
-- templates/sinatra/app/routes/base.rb.tt
-- templates/sinatra/config.ru.tt
-- templates/sinatra/public/favicon.ico
 homepage: http://github.com/regedarek/singu
 licenses:
 - MIT

data/templates/sinatra/Gemfile.tt

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-ruby '2.1.2'
-
-gem 'sinatra', require: 'sinatra/base'
-gem 'dotenv' # environment variables
-gem 'rake', '~> 10.3'
-
-# DB
-gem 'sqlite3'
-<% if !!@gems %>
-# Custom gems, please set versions
-<%= @gems.collect{|gem| "gem '#{gem}'"}.compact.join("\n") %>
-<% end %>
-group :development do
-  gem 'thin'   #server
-  gem 'byebug' #debugging
-end

data/templates/sinatra/Procfile

@@ -1 +0,0 @@
-web: bundle exec rails s

data/templates/sinatra/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/templates/sinatra/app.rb.tt

@@ -1,28 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-# Setup load paths
-Bundler.require
-$: << File.expand_path('../', __FILE__)
-$: << File.expand_path('../lib', __FILE__)
-
-require 'dotenv'
-Dotenv.load
-
-# Require base
-require 'sinatra/base'
-
-libraries = Dir[File.expand_path('../lib/**/*.rb', __FILE__)]
-libraries.each do |path_name|
-  require path_name
-end
-
-require 'app/models'
-require 'app/routes'
-
-module <%= @name.camel_case %>
-  class App < Sinatra::Application
-  end
-end
-
-include <%= @name.camel_case %>::Models

data/templates/sinatra/app/lib/db.rb.tt

@@ -1,13 +0,0 @@
-namespace :db do
-  desc 'Run DB migrations'
-  task :migrate => :app do
-  end
-
-  desc 'Rollback migration'
-  task :rollback => :app do
-  end
-
-  desc 'Dump the database schema'
-  task :dump => :app do
-  end
-end

data/templates/sinatra/app/models.rb.tt

@@ -1,6 +0,0 @@
-module <%= @name.camel_case %>
-  module Models
-    # Example:
-    # autoload :Post, 'app/models/post'
-  end
-end

data/templates/sinatra/app/routes.rb.tt

@@ -1,8 +0,0 @@
-module <%= @name.camel_case %>
-  module Routes
-    autoload :Base, 'app/routes/base'
-
-    # Example route loading:
-    # autoload :Posts, 'app/routes/posts'
-  end
-end

data/templates/sinatra/app/routes/base.rb.tt

@@ -1,9 +0,0 @@
-module <%= @name.camel_case %>
-  module Routes
-    class Base < Sinatra::Application
-      configure do
-        set :root, App.root
-      end
-    end
-  end
-end

data/templates/sinatra/config.ru.tt

@@ -1,3 +0,0 @@
-require './app'
-
-run <%= @name.camel_case %>::App