g2 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b266998f829d48369168291fc82bf84064aea16f
-  data.tar.gz: fccb7aae8436a6fb6ff4481fc4767db82ccc9403
+  metadata.gz: 157d4cf0b48b61090fe4a28fd8fcca56d812dc24
+  data.tar.gz: a103604449935a3d17a0ab90e1ace5b1802b2a6a
 SHA512:
-  metadata.gz: 21e39bbc0876db258271bbfe71b90d8a5e37d89e4ff0d3a18284d10b66b4578c1bdc03f19a0be2e66e61baf0cba4edec4fdea1cb22f76c16a858826396bce0b7
-  data.tar.gz: 9a0978f878ad41bfcf8ce9fd8cf0fd0a56babcc3be946e15b3de194c8b52c058d5a57360b5b89359bff6bb510e4f7ee1ae4d27c70303047e04e647e5b3c1df9f
+  metadata.gz: c858ff0e03857b6d397cc341b9922aa06106d5fa6e8c62834c049d788a7c814ea0c59a4cc8860138c45547c8119f891650547e7327ec789917ed8068fceb0b5d
+  data.tar.gz: 21fcfa31fb827a4dec2d94658c8216529be37128a30cb677c3ded1cb1a2d94a4ddeaa8605d0b4dff40637e6236474f85c571455ace494853e4661ddd47dc3eca

data/g2.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "thor"
-  spec.add_development_dependency "rake"
+  spec.add_runtime_dependency "bundler", "~> 1.3"
+  spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "rake"
 end

data/lib/g2/cli.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "active_support/inflector"
 
 module G2
   class Cli < Thor
@@ -12,7 +13,7 @@ module G2
       @app_name = app_root.capitalize
 
       # create folder structure
-      %w{app app/apis app/helpers app/models config config/environments db script log tmp tmp/pids spec}.each do |item|
+      %w{app app/apis app/helpers app/models config config/environments db script log tmp spec spec/apis spec/models spec/helpers}.each do |item|
         empty_directory app_root + "/" + item
       end
 
@@ -65,9 +66,33 @@ module G2
     end
 
     desc "g", "generate files"
-    def g
-      say "not implemented yet ):", :yellow
+    def g g_type, g_name, *args
+      @class_name = g_name.camelize
+      case g_type
+      when "model"
+        generate_model g_name, args
+      when "migration"
+        generate_migration g_name, args
+      when "api"
+        @resources_symbol = g_name.to_sym
+        generate_api g_name, args
+      else
+        puts "invalid generator type"
+      end
     end
 
+    private
+
+    def generate_model name, *args
+      template "templates/generator/model.erb", File.join('app/models', "#{name}.rb")
+    end
+
+    def generate_migration name, *args
+      template "templates/generator/migration.erb", File.join('db/migrate', "#{Time.now.to_i}_#{name}.rb")
+    end
+
+    def generate_api name, *args
+      template "templates/generator/api.erb", File.join('app/apis', "#{name}_api.rb")
+    end
   end
 end

data/lib/g2/templates/database.erb

@@ -1,5 +1,5 @@
 defaults: &defaults
-  adapter: mysql2
+  adapter: em_mysql2
   encoding: utf8
   pool: 5
   host: localhost
@@ -8,9 +8,9 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: <%= @app_name %>_development
+  database: <%= @app_name.downcase %>_development
 
 test:
   <<: *defaults
-  database: <%= @app_name %>_test
+  database: <%= @app_name.downcase %>_test
 

data/lib/g2/templates/generator/api.erb

@@ -0,0 +1,11 @@
+class <%= @class_name %>Api < Grape::API
+
+  resources :<%= @resources_symbol %> do
+
+    get "/" do
+      {name: "<%= @class_name %>"}
+    end
+
+  end
+
+end

data/lib/g2/templates/generator/migration.erb

@@ -0,0 +1,4 @@
+class <%= @class_name %> < ActiveRecord::Migration
+  def change
+  end
+end

data/lib/g2/templates/generator/model.erb

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

data/lib/g2/templates/rakefile.erb

@@ -4,14 +4,14 @@ require 'em-synchrony/activerecord'
 require 'yaml'
 
 def db_conf
-  config = YAML.load File.read('config/database.yml')
+  YAML.load File.read('config/database.yml')
 end
 
 namespace :db do
   desc "loads database configuration in for other tasks to run"
   task :load_config do
-    env = ENV["G2_ENV"]
-    ActiveRecord::Base.establish_connection db_conf[env]
+    $env = ENV["G2_ENV"] || "development"
+    ActiveRecord::Base.establish_connection db_conf[$env]
   end
   
   desc "creates and migrates your database"
@@ -21,7 +21,7 @@ namespace :db do
   end
   
   desc "migrate your database"
-  task :migrate do
+  task :migrate => :load_config do
     migration_path = ActiveRecord::Migrator.migrations_paths
     version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
     ActiveRecord::Migrator.migrate migration_path, version
@@ -29,12 +29,18 @@ namespace :db do
   
   desc 'Drops the database'
   task :drop => :load_config do
-    ActiveRecord::Base.connection.drop_database db_conf[env]['database']
+    ActiveRecord::Base.connection.drop_database db_conf[$env]['database']
+    puts "#{db_conf[$env]['database']} has been dropped"
   end
   
   desc 'Creates the database'
-  task :create => :load_config do
+  task :create do
+    env = ENV["G2_ENV"] || "development"
+    conf = db_conf[env]
+    conf.delete "database"
+    ActiveRecord::Base.establish_connection conf
     ActiveRecord::Base.connection.create_database db_conf[env]['database']
+    puts "#{db_conf[env]['database']} has been created"
   end
   
 end

data/lib/g2/templates/spec_helper.erb

@@ -8,18 +8,20 @@ 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
+  def get path, params={}, options={}, &block
+    with_api Boot, options do
+      get_request path: path, query: params do |c|
+        json = JSON.parse c.response, symbolize_names: true
+        block.call c, json
       end
     end
   end
 
-  def post path, params={}, &block
-    with_api Boot, params do
-      get_request path: path do |c|
-        block.call c
+  def post path, params={}, options={}, &block
+    with_api Boot, options do
+      post_request path: path, body: params do |c|
+        json = JSON.parse c.response, symbolize_names: true
+        block.call c, json
       end
     end
   end

data/lib/g2/version.rb

@@ -1,3 +1,3 @@
 module G2
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/g2/cli_spec.rb

@@ -3,5 +3,4 @@ require "spec_helper"
 require "g2/cli"
 
 describe G2::Cli do
-  it { 1.should == 1 }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g2
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - lizhe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,7 +17,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,7 +31,21 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +59,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -74,6 +88,9 @@ files:
 - lib/g2/templates/application.erb
 - lib/g2/templates/database.erb
 - lib/g2/templates/gemfile.erb
+- lib/g2/templates/generator/api.erb
+- lib/g2/templates/generator/migration.erb
+- lib/g2/templates/generator/model.erb
 - lib/g2/templates/guardfile.erb
 - lib/g2/templates/rakefile.erb
 - lib/g2/templates/rspec_config.erb