rapp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e9abf5c8f9d574aead36787b16b0dc3fdab168
-  data.tar.gz: b4dcad3ea8bd4e9b36b9aa67b9b575374343fa4c
+  metadata.gz: c296df48d1c482b07ddf0e3d09092bad7966b3e7
+  data.tar.gz: 5d4a5c69a4b7a0fd42cc8baaadf4ab4950de7e8f
 SHA512:
-  metadata.gz: d83da45f2c2675d93b3de934bf653b0c6666a2fb307807f01e744c640aa567d2d7ede0ef12e751cf4541b1ab257af906d751291738c6914b9145bdfdfaf5eae2
-  data.tar.gz: ccb2b464c2d428b38719b26b2f3ee8e8f809f17a254f0a9dfaa114550077e8ea7c132baf9407bf643bd9cf5e3b54ab7afe44649342f20d9f461ad4684f2a6e06
+  metadata.gz: 4212bda2d439e05d0c0ade2d93aa2c9cc47996483a83d63cfd9ffdb403897fd1aeb3b8cb762a9e47ceb6279e976e48721d4ed93dc4fcfe60d9a7cdfaf9163d7a
+  data.tar.gz: cac8b975f8e35fb4ff8261152e4a8ac9b7219716a1a52fe1b799328459722652d3020fbedd5fbd2534275792ea5109a8a9399e0f2c02c7741f8769db49021e9f

data/lib/rapp/builder.rb

@@ -33,12 +33,7 @@ module Rapp
         # Build the directory structure first
         Dir.mkdir(root_dir)
 
-        DirectoryStructure.each do |dir|
-          dir_name = "#{root_dir}/#{dir}"
-          FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
-        end
-        
-        # For each template, render it, place it in the folder structure it corresponds to
+        add_directories(DirectoryStructure, app_name, root_dir)
         
         # Construct the data object
         template_binding = OpenStruct.new(
@@ -47,18 +42,11 @@ module Rapp
             :rapp_version=>Rapp::VERSION
           })
 
+        # For each template, render it, place it in the folder structure it corresponds to
         # Skip spec dirs unless they said they wanted it
         # My intention here is to use "or" specifically, because it does not short-circuit. The second check is very important
         Dir["#{template_root}/**/*"].reject { |p|  File.directory? p or p.include?('spec') }.each do |template|
-          template_data = File.read(template)
-          relative_name = template.split("templates/")[1][0..-5]
-          # Hack to make the entry point ruby file share the same name as the app
-          # Need to clean this up, make it more extensible...
-          relative_name = "#{app_name}.rb" if relative_name == "app.rb"
-          relative_name = "#{app_name}_base.rb" if relative_name == "app_base.rb"
-          
-          result = ERB.new(template_data).result(template_binding.instance_eval {binding})
-          File.write("#{root_dir}/#{relative_name}", result)
+            write_file(template, template_binding, app_name, root_dir)
         end
 
         # If set on the cli, build the spec stuff
@@ -68,6 +56,24 @@ module Rapp
         puts "#{`find ./#{app_name}`}"
       end
 
+      def add_directories(directories, app_name, root_dir)
+        directories.each do |dir|
+          dir.gsub!('app_name', app_name) if dir.include?("app_name")
+          dir_name = "#{root_dir}/#{dir}"
+          FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
+        end
+      end
+
+      def write_file(template_name, template_binding, app_name, root_dir)
+        template_data = File.read(template_name)
+        relative_name = template_name.split("templates/")[1][0..-5]
+        # Hack to make the entry point ruby file share the same name as the app
+        relative_name.gsub!("app_name", app_name)
+
+        result = ERB.new(template_data).result(template_binding.instance_eval {binding})
+        File.write("#{root_dir}/#{relative_name}", result)
+      end
+
       def add_specs(root_dir, options)
         app_name = options[:name]
         #add rspec to the gemfile
@@ -75,12 +81,8 @@ module Rapp
           f.puts 'gem "rspec", "~>3.1.0"'
         end
 
-        # Create the directory structrue
-        SpecStructure.each do |dir|
-          name = dir.gsub!('app_name', app_name) if dir.include?("app_name")
-          dir_name = "#{root_dir}/#{name}"
-          FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
-        end
+        # Add the spec specific directories
+        add_directories(SpecStructure, app_name, root_dir)
 
         # Construct the data object
         template_binding = OpenStruct.new(
@@ -91,11 +93,7 @@ module Rapp
 
         # Get all the spec templates
         Dir["#{template_root}/spec/**/*"].reject {|p| File.directory? p }.each do |template|
-          template_data = File.read(template)
-          relative_name = template.split("templates/")[1][0..-5]
-          relative_name = relative_name.gsub!('app_name', app_name) if relative_name.include?("app_name")
-          result = ERB.new(template_data).result(template_binding.instance_eval {binding})
-          File.write("#{root_dir}/#{relative_name}", result)
+          write_file(template, template_binding, app_name, root_dir)
         end
       end
 

data/lib/rapp/version.rb

@@ -1,3 +1,3 @@
 module Rapp
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - StabbyCutyou
@@ -72,8 +72,8 @@ files:
 - lib/rapp/cli.rb
 - lib/rapp/templates/Gemfile.erb
 - lib/rapp/templates/Rakefile.erb
-- lib/rapp/templates/app.rb.erb
-- lib/rapp/templates/app_base.rb.erb
+- lib/rapp/templates/app_name.rb.erb
+- lib/rapp/templates/app_name_base.rb.erb
 - lib/rapp/templates/config/environments/development.rb.erb
 - lib/rapp/templates/config/environments/production.rb.erb
 - lib/rapp/templates/config/environments/test.rb.erb