g2 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c73c1365f8686c7938c56686f7e8dce9934d1531
-  data.tar.gz: 0bcfa1eeaf1b245d3f1e0920bb03f37541a86ccb
+  metadata.gz: 0bf5bcca29bb9fea528235464c1e32e0b6b236ba
+  data.tar.gz: 3282c4b1bb2bbbf967b9d799221c6f401e366d73
 SHA512:
-  metadata.gz: bb3d9b5ae6032b10abf1f211ac90b0009b351634346e226353b7a466d0bdf19ae0847d18abb0c25b2123989596df2801b29e7bb25e0f527d9fdf1a626f2a620b
-  data.tar.gz: 27ea9ba2d8432ad6d347ec7b88a1fabcf3cd64005814d6e53d3011361aeab18106832e183de6ab8c689754245de3b5512f4a41412b8038d7fe8bfc1a0655b279
+  metadata.gz: d09081eecc157bcd5ded193736cd2a177ee4f6e255c1d3a922b1d47d11dbe5f6f56448d3eea942aff0b3d621ac7aa91042c8fa6e58ed0e0aa64d05f68549edc3
+  data.tar.gz: bfc93cda1577268d0375391d2649dad4b4ea9ca4aa66249cab4f3df8179b2643d0ce61b7108535e1c3caa6948719b90f70107e0069be1fdc80f9f83f2ba8216b

data/lib/g2/cli.rb

@@ -6,7 +6,7 @@ module G2
 
     source_root File.dirname(__FILE__)
 
-    desc "new", "create a new grape goliath application"
+    desc "new [app]", "create a new grape goliath application"
     def new app_root
       say "create a new grape goliath application named #{app_root}", :green
       @app_name = app_root.capitalize
@@ -19,8 +19,10 @@ module G2
       # create basic files
       {
         application: "config/application.rb",
+        database: "config/database.yml",
         spec_helper: "spec/spec_helper.rb",
         gemfile: "Gemfile",
+        guardfile: "Guardfile",
         rakefile: "Rakefile",
         rspec_config: ".rspec",
         server: "script/server.rb"
@@ -33,13 +35,13 @@ module G2
       end
     end
 
-    desc "server", "start goliath server"
+    desc "s [options]", "start goliath server"
     method_option :port, :aliases => "-p", :desc => "server port"
     method_option :environment, :aliases => "-e", :desc => "server environment"
     method_option :pid, :aliases => "-P", :desc => "server pid path"
     method_option :log, :aliases => "-l", :desc => "server log path"
     method_option :daemon, :aliases => "-d", :desc => "run server as daemon"
-    def server
+    def s
       command = "ruby script/server.rb -p #{options[:port] || 3030} -e #{options[:environment] || 'development'}"
 
       if options[:log]
@@ -57,12 +59,14 @@ module G2
       exec command
     end
 
-    desc "console", "start console"
-    def console
+    desc "c", "start console"
+    def c
+      say "not implemented yet ):", :yellow
     end
 
-    desc "generator", "generate files"
-    def generate
+    desc "g", "generate files"
+    def g
+      say "not implemented yet ):", :yellow
     end
 
   end

data/lib/g2/templates/application.erb

@@ -1,34 +1,15 @@
-app_dir = File.expand_path("../../app", __FILE__)
+db_config = YAML.load_file(G2.config.config_dir + '/database.yml')
+ActiveRecord::Base.establish_connection(db_config[G2.env.to_s])
 
-%w{apis helpers models}.each do |dir|
-  $LOAD_PATH.unshift File.join(app_dir, dir)
-end
-
-$app_resources = { }
-
-[:apis, :helpers, :models].each do |item|
-  $app_resources[item] = []
-
-  Dir.foreach(File.join(app_dir, item.to_s)) do |entry|
-    next if entry == "." || entry == ".."
-    if entry.end_with?("rb")
-      file_name = entry.split(".rb").first.camelize
-      require entry
-
-      $app_resources[item] << file_name.constantize
-    end
-  end
-end
-
-module <%= @app_name %>
+module Gog2
   class Application < Grape::API
     format :json
 
-    $app_resources[:helpers].each do |helper_item|
+    G2.config.app_resources[:helpers].each do |helper_item|
       helper helper_item
     end
 
-    $app_resources[:apis].each do |api_item|
+    G2.config.app_resources[:apis].each do |api_item|
       mount api_item
     end
   end

data/lib/g2/templates/database.erb

@@ -0,0 +1,16 @@
+defaults: &defaults
+  adapter: mysql2
+  encoding: utf8
+  pool: 5
+  host: localhost
+  username: root
+  password: root
+
+development:
+  <<: *defaults
+  database: <%= @app_name %>_development
+
+test:
+  <<: *defaults
+  database: <%= @app_name %>_test
+

data/lib/g2/templates/gemfile.erb

@@ -6,9 +6,13 @@ gem 'em-synchrony'
 
 gem 'activerecord', '~> 4.0.2'
 gem 'mysql2'
+gem 'em-http-request'
+
+group :development do
+  gem 'guard-rspec'
+end
 
 group :test do
   gem 'factory_girl'
   gem 'rspec'
-  gem 'rack-test', require: 'rack/test'
 end

data/lib/g2/templates/guardfile.erb

@@ -0,0 +1,8 @@
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^app/apis/(.+)\.rb$})     { |m| "spec/apis/#{m[1]}_spec.rb" }
+  watch(%r{^app/models/(.+)\.rb$})   { |m| "spec/models/#{m[1]}_spec.rb" }
+  watch(%r{^app/helpers/(.+)\.rb$})  { |m| "spec/helpers/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})          { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')       { "spec" }
+end

data/lib/g2/templates/server.erb

@@ -1,9 +1,68 @@
 require "rubygems"
 require "bundler/setup"
+
 require "active_support"
-require 'goliath'
-require 'em-synchrony/activerecord'
-require 'grape'
+require "grape"
+require "goliath"
+require "em-synchrony/activerecord"
+require 'yaml'
+require 'mysql2'
+
+require "pry"
+
+class G2
+  def self.config
+    @instance ||= G2.new
+  end
+
+  def self.env
+    Goliath.env
+  end
+
+  def root_dir
+    @root_dir ||= File.expand_path("../..", __FILE__)
+  end
+
+  def app_dir
+    @app_dir ||= File.join(root_dir, "app")
+  end
+
+  def config_dir
+    @config_dir ||= File.join(root_dir, "config")
+  end
+
+  def app_resources
+    @app_resources ||= load_resources
+  end
+
+  private
+
+  def load_resources
+    app_resources = { }
+
+    [:apis, :helpers, :models].each do |item|
+      app_resources[item] = []
+
+      Dir.foreach(File.join(app_dir, item.to_s)) do |entry|
+        next if entry == "." || entry == ".."
+        if entry.end_with?("rb")
+          file_name = entry.split(".rb").first.camelize
+          require entry
+
+          app_resources[item] << file_name.constantize
+        end
+      end
+    end
+
+    app_resources
+  end
+
+end
+
+%w{apis helpers models}.each do |dir|
+  $LOAD_PATH.unshift File.join(G2.config.app_dir, dir)
+end
+$LOAD_PATH.unshift G2.config.config_dir
 
 Goliath::Request.log_block = proc do |env, response, elapsed_time|
   request_params = env.params.collect { |param| param.join(": ") }
@@ -14,7 +73,7 @@ Goliath::Request.log_block = proc do |env, response, elapsed_time|
   env[Goliath::Request::RACK_LOGGER].info("#{response.status} #{method} #{path} in #{'%.2f' % elapsed_time} ms")
 end
 
-require File.expand_path('../../config/application', __FILE__)
+require "application"
 
 class Boot < Goliath::API
   use Goliath::Rack::Params

data/lib/g2/templates/spec_helper.erb

@@ -0,0 +1,31 @@
+require "goliath"
+require "goliath/test_helper"
+require "json"
+require "pry"
+
+Goliath.env = :test
+
+require File.expand_path('../../script/server', __FILE__)
+
+module ApiTestHelper
+  def get path, params={}, &block
+    with_api Boot, params do
+      get_request path: path do |c|
+        block.call c
+      end
+    end
+  end
+
+  def post path, params={}, &block
+    with_api Boot, params do
+      get_request path: path do |c|
+        block.call c
+      end
+    end
+  end
+end
+
+RSpec.configure do |c|
+  c.include Goliath::TestHelper
+  c.include ApiTestHelper
+end

data/lib/g2/version.rb

@@ -1,3 +1,3 @@
 module G2
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - lizhe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,9 @@ files:
 - lib/g2.rb
 - lib/g2/cli.rb
 - lib/g2/templates/application.erb
+- lib/g2/templates/database.erb
 - lib/g2/templates/gemfile.erb
+- lib/g2/templates/guardfile.erb
 - lib/g2/templates/rakefile.erb
 - lib/g2/templates/rspec_config.erb
 - lib/g2/templates/server.erb