aspen 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmY1MmJkZmFkODk3NzBjZjBkZWZjZTIxYjBkNzE5OWE5ZTM2ODA1Mg==
-  data.tar.gz: !binary |-
-    NWU3MjI4MTFjNmMxMTgyMmQ3ZjllZWJlM2FjNTFjYTI5ODkwNjgzYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDRkYjM0YjBjMjA0NTBjYjE5NWQ4MzljMWRiNTFlYzM4ZGFiMTZhMjc5ZDJi
-    MmU5ZWY0ZTE1NDY5OTUzNTM0Njk1NjJhM2M1ZmZjOTEzMGM1NTI5YjUwZjcy
-    YzYzN2Q2MmZiYTlhYTU0MjQ4MmE1ODJmM2YyYzczMTMwNDJhYWI=
-  data.tar.gz: !binary |-
-    ODdiNGE3MTNmYTczYzRmNWYyZGM5NzcwMGE1MGVmYzhmMDVjOTE2NDAzNWM5
-    ODI5MzY1YmFmNjA3MjA0MjU0NTNmMjk0MjI1OTUzNzQ4OTlmNGU1NmU5MGI0
-    MzYxZjdkZDU2ODNkZmJhYmY1ZWM3ZjdiZjdkYmM3MDYzZmFiZWM=
+SHA1:
+  metadata.gz: e7b81d14f098e2f0f6fdeccc1fbd4c405b2c24d2
+  data.tar.gz: 99c0b80ca9254e9cd31bda64e6a6ac68e11bda0d
+SHA512:
+  metadata.gz: 046e140dc73f9d7e465f1d4102365efdcb17e4401eed1e454b1a1a14a10868d9942ba7e994bd90f2b9248203dd7bc7439061d1e07e8dce0a93562ace5f3cc529
+  data.tar.gz: 028a782c70bd53ad0c0e57ab67aaa9fd33b5c689adc0870d385ec7d2c8bcc240d310743b2a07e956785e11bfa1e01b2bf93ebc0146b2ec3e202cbdcbc413c918

data/config/environment.rb

@@ -4,7 +4,7 @@ require 'pry'
 require 'git'
 require 'trollop'
 
-AspenRoot = File.expand_path(File.dirname(__FILE__)).gsub("/config", "")
+AspenRoot = File.expand_path('../', File.dirname(__FILE__))#.gsub("/config", "")
 
 def get_reqs(current_dir)
   Dir.foreach(current_dir) do |file|

data/lib/aspen.rb

@@ -36,7 +36,7 @@ EOS
   def self.run
     @@root_name = sterilize_project_name(@@args.leftovers)
     load_template
-    @@directories = AspenTemplate.tree(TEMPLATE)
+    @@directories = AspenTemplate.tree(TEMPLATE, "#{AspenRoot}/lib/templates/#{@@opts[:template]}")
     project_init
   end
 
@@ -61,11 +61,12 @@ EOS
 
   def self.load_template
     if @@opts[:template] == nil
-      require_relative "#{AspenRoot}/lib/templates/default.rb"
+      @@opts[:template] = "default"
+      require_relative "#{AspenRoot}/lib/templates/default/template.rb"
     else
       Dir.foreach("#{AspenRoot}/lib/templates") do |file|
         if file.start_with?("#{@@opts[:template].downcase.strip}")
-          require_relative "#{AspenRoot}/lib/templates/#{file}"
+          require_relative "#{AspenRoot}/lib/templates/#{file}/template.rb"
           break
         end
       end
@@ -79,19 +80,21 @@ EOS
   def self.project_init
     directory_init
     rspec_init
-    make_files if @@opts[:template] == nil || @@opts[:template] == "default"
+    make_files # if @@opts[:template] == nil || @@opts[:template] == "default"
     successful_creation
     write_to_files
     process_flags
   end
 
   def self.directory_init
-    self.directories.each {|dir| FileUtils.mkdir_p("#{@@root_name}#{dir}", :verbose => true)}
+    self.directories.each do |dir|
+      FileUtils.mkdir_p("#{@@root_name}#{dir}", :verbose => true)
+    end
   end
 
   def self.make_files
     FileUtils.touch("#{@@root_name}/README.md")
-    FileUtils.touch("#{@@root_name}/config/environment.rb")
+    AspenFile.all.each {|af| af.create("#{@@root_name}") }
   end
 
   def self.write_to_files

data/lib/aspen_file.rb

@@ -0,0 +1,29 @@
+require_relative '../config/environment'
+
+class AspenFile
+
+  attr_reader :direc, :file, :templ
+
+  @@all = []
+
+  def self.all
+    @@all
+  end
+
+  def initialize(templ, direc, file)
+    @templ = templ
+    if direc.length != 0
+      @direc = direc + "/" 
+    else
+      @direc = ""
+    end
+    @file = file
+    @@all << self
+  end
+
+  def create(root)
+    FileUtils.cp("#{self.templ}/#{self.file[0]}", "#{root}#{self.direc}#{self.file[0]}")
+    puts "  create   #{self.direc}#{self.file[0]}"
+  end
+
+end

data/lib/aspen_template.rb

@@ -1,19 +1,23 @@
+require_relative '../config/environment'
+
 class AspenTemplate
 
-  def self.tree(hash)
-    self.tree_gen(hash).flatten.unshift("")
+  def self.tree(hash, direc)
+    @@direc = direc
+    self.tree_gen(hash).flatten.unshift("").uniq
   end
 
-
   def self.tree_gen(hash, root="")
     folders_array = hash.collect do |key, value|
       if value.size == 0
         "#{root}/#{key}"
+      elsif value.is_a?(Array)
+        AspenFile.new(@@direc, "#{root}", value)
+        "#{root}"
       else
         self.tree_gen(value, "#{root}/#{key}")
       end
     end
   end
 
-
 end

data/lib/templates/default/environment.rb

@@ -0,0 +1,18 @@
+RootFolder = File.expand_path(File.dirname(__FILE__)).gsub('/config', '')
+
+def get_reqs(current_dir)
+  Dir.foreach(current_dir) do |file|
+    next if file.start_with?('.') || file.start_with?('environment.rb') || file.end_with?('spec.rb') # add additional filters here for files you don't want included
+    if File.directory?(current_dir + '/' + file)
+      next if file.start_with?('templates')
+      get_reqs(current_dir+ '/' + file)
+    else
+      require_relative (current_dir + '/' + file) if file.end_with?('.rb')
+    end
+  end
+end
+
+Dir.foreach(RootFolder) do |file|
+  next if file.start_with?('.')
+  get_reqs(RootFolder + '/' + file) if File.directory?(RootFolder + '/' + file)
+end

data/lib/templates/default/template.rb

@@ -0,0 +1,9 @@
+TEMPLATE = {
+              :bin => {},
+              :config => {:file1 => ["environment.rb"]},
+              :lib => {
+                :models => {
+                  :concerns => {}
+                },
+              }
+            }

data/lib/templates/sinatra/app.rb

@@ -0,0 +1,8 @@
+require 'sinatra'
+
+class YourApp < Sinatra::Base
+
+  get '/' do
+  end
+
+end

data/lib/templates/sinatra/config.ru

@@ -0,0 +1,2 @@
+require './app'
+run YourApp

data/lib/templates/sinatra/template.rb

@@ -0,0 +1,7 @@
+TEMPLATE = {
+              :models => {},
+              :public => {},
+              :views => {},
+              :file1 => ["app.rb"],
+              :file2 => ["config.ru"]
+            }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspen
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Logan Hasson
@@ -17,42 +17,42 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Sets up a directory tree for coding projects based on customizable templates
@@ -66,9 +66,14 @@ files:
 - bin/aspen
 - config/environment.rb
 - lib/aspen.rb
+- lib/aspen_file.rb
 - lib/aspen_template.rb
-- lib/templates/default.rb
-- lib/templates/hello.rb
+- lib/templates/default/environment.rb
+- lib/templates/default/template.rb
+- lib/templates/hello/template.rb
+- lib/templates/sinatra/app.rb
+- lib/templates/sinatra/config.ru
+- lib/templates/sinatra/template.rb
 homepage: http://rubygems.org/gems/aspen
 licenses:
 - MIT
@@ -79,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: aspen gem

data/lib/templates/default.rb

@@ -1,8 +0,0 @@
-TEMPLATE = {
-              :bin => {},
-              :config => {},
-              :lib => {
-                :models => {},
-                :concerns => {}
-              }
-            }