nrb 1.0.0 → 1.1.0

data/lib/nrb/commands/script.rb

@@ -1,85 +1,103 @@
+require 'pathname'
+
 module Nrb
   module Commands
-    class Script < Thor::Group
-      include Thor::Actions
-
-      desc 'Creates a Ninja Ruby Script at the given path'
+    class Script < Commands::Base
+      desc 'Creates a Ninja Ruby Script at the given path.'
 
       argument :path_or_folder_name, type: :string, required: true,
         desc: 'The name of the project, or the path.'
 
       class_option :init_repo, default: true, type: :boolean,
-        desc: 'Initialize a repository at the target location',
+        desc: 'Initialize a repository at the target location.',
         aliases: '-r'
-      class_option :bundle_install, default: true, type: :boolean,
-        desc: 'Run bundle install after generating the skeleton',
+
+      class_option :bundle_install, default: false, type: :boolean,
+        desc: 'Run bundle install after generating the skeleton.',
         aliases: '-b'
 
-      def self.source_root
-        File.expand_path('..', __dir__)
-      end
+      class_option :local, default: false, type: :boolean,
+        desc: 'Add local path of the gem when generating the Gemfile. Useful for testing.'
 
       def gitignore
-        template 'templates/.gitignore.tt', target('.gitignore')
+        template 'templates/.gitignore.tt', target('.gitignore'), opts
       end
 
       def readme
         template 'templates/README.md.tt', target('README.md'),
-          title: name,
-          version: Nrb::VERSION
+          opts.merge({ title: name, version: Nrb::VERSION })
       end
 
       def gemfile
         template 'templates/Gemfile.tt', target('Gemfile'),
-          version: Nrb::VERSION
+          opts.merge({ nrb_gem: nrb_gem })
       end
 
       def rakefile
-        template 'templates/Rakefile.tt', target('Rakefile')
+        template 'templates/Rakefile.tt', target('Rakefile'), opts
       end
 
       def config_nrb
         template 'templates/config/nrb.rb.tt', target('config/nrb.rb'),
-          directories: Nrb.config.directories
+          opts.merge({ resources: Nrb.config.resources })
       end
 
-      def directories
-        Nrb.config.directories.each do |dir|
-          create_file target("#{dir}/.keep")
+      def resources
+        Nrb.config.resources.each do |dir|
+          create_file target("#{dir}/.keep"), opts
         end
       end
 
       def boot
-        template 'templates/config/boot.rb.tt', target('config/boot.rb')
+        template 'templates/config/boot.rb.tt', target('config/boot.rb'), opts
       end
 
       def db_config
         template 'templates/db/config.yml.tt', target('db/config.yml'),
-          db: name
+          opts.merge({ db: name })
       end
 
       def script_file
-        template 'templates/script.rb.tt', "#{target(name)}.rb"
+        template 'templates/script.rb.tt', "#{target(name)}.rb", opts
       end
 
       def initialize_repo
-        return unless options[:repo]
+        return unless options[:init_repo]
 
-        inside target, verbose: true do
-          run 'git init'
+        inside target, opts do
+          Nrb.silently verbose: options[:verbose] do
+            run 'git init'
+          end
         end
       end
 
       def bundle_install
-        return unless options[:bundle]
-
-        inside target, verbose: true do
-          run 'bundle install'
+        return unless options[:bundle_install]
+
+        inside target, opts do
+          Bundler.with_clean_env do
+            Nrb.silently verbose: options[:verbose] do
+              run 'bundle install'
+            end
+          end
         end
       end
 
       private
 
+      def nrb_gem
+        text = "gem 'nrb', '#{Nrb::VERSION}'"
+
+        if options[:local]
+          local_gem_path = Pathname.new(File.expand_path('../../..', __dir__))
+          target_path    = Pathname.new(target)
+          relative_path  = local_gem_path.relative_path_from(target_path)
+          text << ", path: '#{relative_path}'"
+        end
+
+        text
+      end
+
       def target(final = nil)
         File.join(File.expand_path(path_or_folder_name), final.to_s)
       end

data/lib/nrb/commands/starter.rb

@@ -1,9 +1,7 @@
-require 'nrb/commands/inside_group'
-
 module Nrb
   module Commands
-    class Starter < InsideGroup
-      desc_with_warning "Require the main file"
+    class Starter < Commands::Inside
+      desc 'Require the main file.'
 
       def start
         require_main_file

data/lib/nrb/errors.rb

@@ -0,0 +1,4 @@
+module Nrb
+  class OutsideRootError < Thor::Error; end;
+  class InvalidResourceError < Thor::Error; end;
+end

data/lib/nrb/templates/Gemfile.tt

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-ruby '2.3.0'
-
-gem 'nrb', '<%= config[:version] %>'
+<%= config[:nrb_gem] %>

data/lib/nrb/templates/config/boot.rb.tt

@@ -1,6 +1,6 @@
 # Setup the listed gems in the gemfile
 require 'bundler/setup'
-<%# TODO: Maybe add gemfile groups? %>
+
 # Actually require the gems
 Bundler.require(:default)
 
@@ -8,7 +8,7 @@ Bundler.require(:default)
 Nrb.config.root = File.expand_path('..', __dir__)
 
 # Add the root to the load path
-$:.unshift(Nrb.root)
+$:.unshift(Nrb.root) unless $:.include?(Nrb.root)
 
 # Require other configurations from the config/nrb.rb file
 require 'config/nrb'
@@ -19,7 +19,7 @@ ActiveRecord::Base.configurations = YAML.load_file('db/config.yml')
 ActiveRecord::Base.establish_connection(:development)
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 
-# Finally require files inside config.directories
-Nrb.config.directories.each do |dir|
+# Finally require files inside config.resources
+Nrb.config.resources.each do |dir|
   Dir[File.join(dir, '*.rb')].each { |f| require(f) }
 end

data/lib/nrb/templates/config/nrb.rb.tt

@@ -2,6 +2,6 @@ Nrb.configure do |config|
   # Root of the script folder
   config.root = File.expand_path('..', __dir__)
 
-  # Default directories to autoload
-  # config.directories = %w(<%= config[:directories].join(' ') %>)
+  # Default resources to autoload
+  # config.resources = %w(<%= config[:resources].join(' ') %>)
 end

data/lib/nrb/templates/script.rb.tt

@@ -1,3 +1 @@
 require File.join(__dir__, 'config/boot')
-
-puts 'do the monkey with me!'

data/lib/nrb/version.rb

@@ -1,3 +1,3 @@
 module Nrb
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/nrb.gemspec

@@ -20,11 +20,16 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_dependency "thor", "~> 0.19.1"
+  spec.add_development_dependency "minitest", "~> 5.8.0"
+  spec.add_development_dependency "guard", "~> 2.13.0"
+  spec.add_development_dependency "guard-minitest", "~> 2.4.0"
+  spec.add_development_dependency "guard-rubocop", "~> 1.2.0"
+  spec.add_development_dependency "coveralls", "~> 0.8.13"
+  spec.add_development_dependency "rubocop", "~> 0.38.0"
+  spec.add_dependency "thor", "~> 0.19.0"
+  spec.add_dependency "standalone_migrations", "~> 4.0.0"
+  spec.add_dependency "sqlite3", "~> 1.3.0"
   spec.add_dependency "pry"
   spec.add_dependency "pry-byebug"
   spec.add_dependency "binding_of_caller"
-  spec.add_dependency "standalone_migrations", "~> 4.0.3"
-  spec.add_dependency "sqlite3", "~> 1.3.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nrb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - shuriu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,58 +44,128 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.8.0
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.13
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.38.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: standalone_migrations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,33 +179,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: standalone_migrations
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: '0'
 description: 
 email:
 - stefan.rotariu@gmail.com
@@ -144,9 +214,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -154,12 +227,17 @@ files:
 - bin/nrb
 - lib/nrb.rb
 - lib/nrb/cli.rb
+- lib/nrb/commands/all.rb
+- lib/nrb/commands/base/base.rb
+- lib/nrb/commands/base/inside.rb
+- lib/nrb/commands/base/resource.rb
+- lib/nrb/commands/concerns/resource_generator.rb
 - lib/nrb/commands/console.rb
 - lib/nrb/commands/destroy.rb
 - lib/nrb/commands/generate.rb
-- lib/nrb/commands/inside_group.rb
 - lib/nrb/commands/script.rb
 - lib/nrb/commands/starter.rb
+- lib/nrb/errors.rb
 - lib/nrb/templates/.gitignore.tt
 - lib/nrb/templates/Gemfile.tt
 - lib/nrb/templates/README.md.tt
@@ -197,3 +275,4 @@ signing_key:
 specification_version: 4
 summary: Ninja Ruby scripts with easy persistence for your experimenting needs.
 test_files: []
+has_rdoc: