rdm 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4947208b5f0d21df716919d7c796e6af40f6795e
-  data.tar.gz: bef05794da4fca103eaedd3d1b6e441b427ad1cc
+  metadata.gz: 030a4105373d24a3ba5d97a52cb34d0bf2c79d2f
+  data.tar.gz: af38a6d0eeb9354bfe33d1beba9c1d289b75fcd5
 SHA512:
-  metadata.gz: c5eb3843050d05e5e0a5b72eccf98c617349e8790b2a72dc7987365a6063d08361ee5b96ebf420d240c1f4e2e49682107975f644832ad8953b912f30951637aa
-  data.tar.gz: e248fb9f3cefa59e8ceb324820b688ba50fbcec5b7ccffd0796daee94326d9049c98f0e6d841aa5feaf7214bf45c434c1dcee9c0a0326a5cda7c87fa0ef74ddc
+  metadata.gz: d042a73c45f127800653f8dab0fc5a4cb40c5ab1fdddd0a1c842e2579c245205523389d751099b301a128b89eea3e59a896998ee9764e341b682e0f6c4ece6c3
+  data.tar.gz: 056d522dc8c85d7ebfe1450ad119431bda4e33ccf54c7e0a015ff9c749f0c2de4328836b700f6e32757941a9f25e04e946339825ae632c4d800a4f6ffebdac2d

data/example/Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
 
 gem "sequel"
-gem "rdm", path: "../"
+gem "rspec"
+gem "rdm", path: "../"

data/lib/rdm/package_generator.rb

@@ -1,4 +1,20 @@
 require 'fileutils'
+require 'pathname'
+require "active_support/inflector"
+
+
+# http://stackoverflow.com/questions/8954706/render-an-erb-template-with-values-from-a-hash
+require 'erb'
+require 'ostruct'
+class ErbalT < OpenStruct
+  def self.render(template, locals)
+    self.new(locals).render(template)
+  end
+  def render(template)
+    ERB.new(template).result(binding)
+  end
+end
+
 
 class Rdm::PackageGenerator
   class << self
@@ -32,17 +48,35 @@ class Rdm::PackageGenerator
     package_subdir_name = Rdm.settings.send(:package_subdir_name)
 
     Dir.chdir(current_dir) do
-      FileUtils.mkdir_p(File.join(package_relative_path, package_subdir_name, package_name))
-      FileUtils.touch(File.join(package_relative_path, package_subdir_name, "#{package_name}.rb"))
-      FileUtils.touch(File.join(package_relative_path, '.gitignore'))
-
+      ensure_file([package_relative_path, '.gitignore'])
+      ensure_file(
+        [package_relative_path, package_subdir_name, "#{package_name}.rb"],
+        template_content("main_module_file.rb.erb", {package_name_camelized: package_name.camelize})
+      )
+      ensure_file(
+        [package_relative_path, 'Package.rb'],
+        template_content("package.rb.erb", {package_name: package_name})
+      )
       if !skip_rspec
         init_rspec
       end
-
-      File.write(File.join(package_relative_path, 'Package.rb'), package_rb_template)
     end
+
     move_templates
+    append_package_to_rdm_packages
+  end
+
+  def check_preconditions!
+    if Dir.exist?(File.join(current_dir, package_relative_path))
+      raise Rdm::Errors::PackageDirExists, "package dir exists"
+    end
+
+    if rdm_source.package_paths.include?(package_relative_path)
+      raise Rdm::Errors::PackageExists, "package exists"
+    end
+  end
+
+  def append_package_to_rdm_packages
     new_source_content = source_content + "\npackage '#{package_relative_path}'"
     File.write(source_path, new_source_content)
   end
@@ -57,37 +91,30 @@ class Rdm::PackageGenerator
     Dir.chdir(File.join(File.dirname(__FILE__), "templates")) do
       copy_template(".rspec")
       copy_template(".gitignore")
-      copy_template("rspec/spec_helper.rb")
+      copy_template("spec/spec_helper.rb")
+      copy_template("bin/console_irb", "bin/console")
     end
   end
 
-  def copy_template(filepath)
-    from = filepath
-    to   = File.join(current_dir, package_relative_path, filepath)
-    FileUtils.mkdir_p(File.dirname(to))
-    FileUtils.cp(from, to)
+private
+  def ensure_file(path_array, content="")
+    filename = File.join(*path_array)
+    FileUtils.mkdir_p(File.dirname(filename))
+    File.write(filename, content)
   end
 
-  def check_preconditions!
-    if Dir.exist?(File.join(current_dir, package_relative_path))
-      raise Rdm::Errors::PackageDirExists, "package dir exists"
-    end
-
-    if rdm_source.package_paths.include?(package_relative_path)
-      raise Rdm::Errors::PackageExists, "package exists"
-    end
+  def copy_template(filepath, target_name=nil)
+    from          = filepath
+    target_name ||= filepath
+    to            = File.join(current_dir, package_relative_path, target_name)
+    FileUtils.mkdir_p(File.dirname(to))
+    # copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
+    FileUtils.copy_entry(from, to, true, false, true)
   end
 
-  def package_rb_template
-v = <<EOF
-package do
-  name    '#{package_name}'
-  version '1.0.0'
-end
-
-dependency do
-  # import 'utils'
-end
-EOF
+  def template_content(file, locals={})
+    template_path    = Pathname.new(File.join(File.dirname(__FILE__), "templates")).join(file)
+    template_content = File.read(template_path)
+    ErbalT.render(template_content, locals)
   end
 end

data/lib/rdm/templates/bin/console_irb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require "bundler/setup"
+require "rdm"
+Rdm.init(File.expand_path('../../', __FILE__))
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/lib/rdm/templates/main_module_file.rb.erb

@@ -0,0 +1,3 @@
+module <%= package_name_camelized %>
+
+end

data/lib/rdm/templates/package.rb.erb

@@ -0,0 +1,8 @@
+package do
+  name    '<%= package_name %>'
+  version '1.0.0'
+end
+
+dependency do
+  # import 'utils'
+end

data/lib/rdm/templates/{rspec → spec}/spec_helper.rb

@@ -1,7 +1,7 @@
 ENV['RUBY_ENV'] = 'test'
 
 require 'rdm'
-Rdm.init(File.expand_path('../../', FILE), :test)
+Rdm.init(File.expand_path('../../', __FILE__), :test)
 
 require 'rspec'
 require 'byebug'

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Droid Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +115,10 @@ files:
 - lib/rdm/source_parser.rb
 - lib/rdm/templates/.gitignore
 - lib/rdm/templates/.rspec
-- lib/rdm/templates/rspec/spec_helper.rb
+- lib/rdm/templates/bin/console_irb
+- lib/rdm/templates/main_module_file.rb.erb
+- lib/rdm/templates/package.rb.erb
+- lib/rdm/templates/spec/spec_helper.rb
 - lib/rdm/version.rb
 - rdm.gemspec
 - spec/fixtures/SampleSource.rb