runways 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8643600c0d33e46d69b23ab93f84ef082e908a830dc59ae34a0658366e9de4c
-  data.tar.gz: 1d365e31477a4d5107f268ff85f886cfa02f2935dd84f599e4cf667b0909bf57
+  metadata.gz: e982aaecae5159992f07d2a5edbc6be3c37d9ca02658cfd0077f8d05eccc7e63
+  data.tar.gz: 70535c84bcdad8ef21a0c9c950119b784b7420e786229ecf1fb90b5aaecb077c
 SHA512:
-  metadata.gz: 8b3bc75c7778c983af7f9549dd5344556e6a66d7771233e99de4406648698943011875a98f0e55b3cb56baa0a3ff9ef5fcae027aa9d4929a498de6d19475e75e
-  data.tar.gz: b663acca7e013ab696f3259bbf8dcb8019acddea5f12e215f2f9fbc1d0d9b93770e83dc4f1f02ed3f51b9a9b196cae2ad9c2e9ad347e24920e2cdd34fbb72ae8
+  metadata.gz: 10d215260565f79d4e378facdac4c6a63b409553f109a0a53f689be57bd48bd3d0f2084e5ddcfca669831b9c54bc2034285ef7fc772095928787fd2c3b8c76d3
+  data.tar.gz: 5725e891dc785f52d2ac395f08b10b13556749b99423eedf5bc36acb1b2a7d569dc7cd368f8711b596fb5d5bdd289cd202a15fc025dea6c7c454cea2d585b358

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    runways (0.1.5)
+    runways (0.1.6)
       activerecord (~> 5.2)
       grpc (~> 1.16)
       grpc-tools (~> 1.16)
@@ -23,10 +23,10 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     concurrent-ruby (1.1.3)
-    google-protobuf (3.6.1-universal-darwin)
+    google-protobuf (3.6.1)
     googleapis-common-protos-types (1.0.2)
       google-protobuf (~> 3.0)
-    grpc (1.16.0-universal-darwin)
+    grpc (1.16.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
     grpc-tools (1.16.0)

data/README.md

@@ -6,16 +6,24 @@ Runways is a gRPC based ruby application. It will setup the basic project struct
 
 Install Runways at the command prompt:
 
-    $ gem install runways
+  $ gem install runways
 
 Create a new runways application:
 
-		$ runways hello
+  $ runways hello
 
 Run the following rake task to update protobuf files:
+
 ```ruby
 	rake protobuf_files:update
 ```
+
+Run the following command to start the server, the server will reload if any file is changed
+
+```ruby
+  APP_ENV=development rerun -- ruby SERVER_FILE.rb
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -42,9 +50,9 @@ Everyone interacting in the Runways project’s codebases, issue trackers, chat
 - [ ] Create runways controller
 - [ ] Refactor generator code
 - [ ] Refactor code to generate protobuf files when the application is initialized
-- [ ] Handle loading the server without DbConfig setup
+- [x] Handle loading the server without DbConfig setup
 - [ ] Handle DbConfig in the ActiveRecord style
 - [ ] Modify rake task to replace `require` with `require_relative` in the services pb file
-- [ ] Handle file loading like how rails handles it
+- [x] Handle file loading like how rails handles it
 - [ ] Accept package name from command line
 - [ ] Don't hard code port

data/lib/runways/dependencies.rb

@@ -0,0 +1,12 @@
+class Object
+  def self.const_missing(c)
+    return nil if @calling_const_missing
+
+    @calling_const_missing = true
+    require c.to_s.underscore
+    klass = Object.const_get(c)
+    @calling_const_missing = false
+
+    klass
+  end
+end

data/lib/runways/generators/app_structure_generator.rb

@@ -54,13 +54,6 @@ class AppStructure < Thor::Group
     )
   end
 
-  def generate_models
-    template(
-      "templates/models.tt",
-      "#{name}/app/models.rb"
-    )
-  end
-
   def generate_service_file
     template(
       "templates/service.tt",
@@ -87,6 +80,10 @@ class AppStructure < Thor::Group
     template("templates/test_client.tt", "#{name}/test/test_client.rb")
   end
 
+  def generate_application_file
+    template("templates/application_config.tt", "#{name}/config/application.rb")
+  end
+
   def run_protoc_cmd
     inside(name) do
       run ("grpc_tools_ruby_protoc -I proto --ruby_out=lib/protos --grpc_out=lib/protos proto/#{name.underscore}.proto")

data/lib/runways/generators/templates/application_config.tt

@@ -0,0 +1,18 @@
+# setting load path
+$LOAD_PATH << File.join(File.dirname(__FILE__), "..", "app", "models")
+$LOAD_PATH << File.join(File.dirname(__FILE__), ".")
+
+# loading required gems
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default)
+
+# setting database connection
+require 'application_record'
+require 'db_config'
+ActiveRecord::Base.establish_connection(
+  DbConfig.config
+)
+
+# requiring protobuf files
+require './lib/protos/<%= name.underscore %>_services_pb'

data/lib/runways/generators/templates/db_rake.tt

@@ -40,8 +40,9 @@ namespace :db do
 
   desc 'Migrate the database'
   task :migrate do
-    establish_connection
-    ActiveRecord::Migrator.migrate('db/migrate/')
+	  establish_connection
+	  ActiveRecord::MigrationContext.new('db/migrate').migrate
+
     Rake::Task['db:update_schema'].execute
     puts 'Database migrated.'
   end

data/lib/runways/generators/templates/gemfile.tt

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'runways', '<%= Runways::VERSION %>'
- gem "sqlite3", "~> 1.3.6"
+gem "sqlite3", "~> 1.3.6"
+
+group :development do
+  gem 'rerun'
+end

data/lib/runways/generators/templates/protobuf_rake.tt

@@ -3,5 +3,9 @@ namespace :protobuf_files do
 	task :update do
 		lang = ARGV[1] || 'ruby'
 		`grpc_tools_ruby_protoc -I proto --ruby_out=lib/protos --grpc_out=lib/protos proto/<%= name.underscore %>.proto`
+		pb_path = "./lib/protos/<%= name.underscore %>_services_pb.rb"
+		lines = File.readlines(pb_path)
+		lines[4] = "require_relative '<%= name.underscore %>_pb'\n"
+		File.open(pb_path, 'w') { |f| f.write(lines.join) }
 	end
 end

data/lib/runways/generators/templates/server.tt

@@ -2,7 +2,8 @@ require 'rubygems'
 require 'bundler/setup'
 require './lib/<%= name.underscore %>_service'
 
-Bundler.require(:default)
+env = ENV['APP_ENV'] || 'development'
+Bundler.require(:default, env)
 
 class <%= name.camelize %>Server
   class << self

data/lib/runways/generators/templates/service.tt

@@ -1,14 +1,4 @@
-require 'rubygems'
-require 'bundler/setup'
-require './config/db_config'
-
-Bundler.require(:default)
-
-ActiveRecord::Base.establish_connection(
-  DbConfig.config
-)
-
-require './lib/protos/<%= name.underscore %>_services_pb'
+require './config/application'
 
 class <%= name.camelcase %>Service < <%= name.camelcase %>::<%= name.camelcase %>Service::Service
 	def hello(request, _unused_call)

data/lib/runways/version.rb

@@ -1,3 +1,3 @@
 module Runways
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/runways.rb

@@ -1,6 +1,8 @@
-require "runways/version"
 require "active_record"
+
+require "runways/version"
 require "runways/generators/app_structure_generator"
+require "runways/dependencies"
 
 module Runways
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runways
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - NG
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,12 +115,13 @@ files:
 - bin/setup
 - exe/runways
 - lib/runways.rb
+- lib/runways/dependencies.rb
 - lib/runways/generators/app_structure_generator.rb
+- lib/runways/generators/templates/application_config.tt
 - lib/runways/generators/templates/application_record.tt
 - lib/runways/generators/templates/db_config.tt
 - lib/runways/generators/templates/db_rake.tt
 - lib/runways/generators/templates/gemfile.tt
-- lib/runways/generators/templates/models.tt
 - lib/runways/generators/templates/proto.tt
 - lib/runways/generators/templates/protobuf_rake.tt
 - lib/runways/generators/templates/rakefile.tt

data/lib/runways/generators/templates/models.tt

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-require './config/db_config'
-require './app/models/application_record.rb'
-
-ActiveRecord::Base.establish_connection(
-  DbConfig.config
-)
-
-(
-  Dir[File.expand_path './app/models/*.rb'] - 
-  Dir[File.expand_path './app/models/application_record.rb']
-).each do |file|
-  require file
-end