new 0.0.15 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44941872e058853db68d974b6a1d7222f7445e96
-  data.tar.gz: cc57d7249836e5a79dd650639749e77faebe5d5c
+  metadata.gz: 49de7a525567990df4a73895129d9016fd6cb025
+  data.tar.gz: a7187f5f73de9b3ccc126306e8243c8ad3377cde
 SHA512:
-  metadata.gz: ef8942fe472fadddd7905a0fabc50abf8ff28d133ba941682c8c0d9e0fe1cfab18514832b8e746ed0e6763b68be07fcc965b00df0d5c0db91d311226804c3ca6
-  data.tar.gz: a21d779989e21de034d6dedc2e47bf4cee52c8a2e1d43504ba13af3447bcf777d509246a53f7c0dde07991d1ba708e4f983a8c51915ce8d2dd57fdb911d56327
+  metadata.gz: d2ee8c15e70e71526ba0681e8d81686e06c80eab051470938e26d89d3dbe6d37ea64ed996bb3da5baf065a48df299aadfddd7b80af946726112b21358d9f8221
+  data.tar.gz: f2784493ad68df62dc988f31d98b5045c1fdebf39b8f1442f3d975903d1d9470e9de1ca43444bb335d9d25d1e3f870da53a7c07c75848e852a802fcc02a01f76

data/.new

@@ -3,6 +3,8 @@ license: MIT
 developer:
   name: Ryan Brewster
   email: brewster1134@gmail.com
+github:
+  username: brewster1134
 tasks:
   gem:
     gemspec:
@@ -15,6 +17,7 @@ tasks:
       bindir: bin
       test_files:
       - spec/**/*.rb
-version: 0.0.15
-project_name: new
+version: 0.1.1
+project:
+  name: new
 type: js

data/Gemfile.lock

@@ -23,7 +23,7 @@ GEM
     guard-bundler (2.0.0)
       bundler (~> 1.0)
       guard (~> 2.2)
-    guard-rspec (4.2.10)
+    guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     i18n (0.6.11)

data/Guardfile

@@ -6,7 +6,7 @@ guard :bundler do
   watch('Gemfile')
 end
 
-guard :rspec, all_after_pass: true, all_on_start: true, cmd: 'bundle exec rspec spec tasks ~/.new/tasks' do
+guard :rspec, all_after_pass: true, all_on_start: true, cmd: 'bundle exec rspec spec tasks' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^tasks/.+_spec\.rb$})
   watch(%r{^tasks/(.+[^_spec])\.rb$}) { |m| "tasks/#{m[1]}_spec.rb" }

data/README.md

@@ -76,7 +76,7 @@ You can also access any custom values set in your local configuration file.
 <%= developer.name %>
 <%= developer.email %>
 <%= type %>
-<%= project_name %>
+<%= project.name %>
 <%= foo %>
 <%= tasks.bar_task.baz %>
 ```

data/lib/new/template.rb

@@ -29,8 +29,10 @@ class New::Template
       .deep_merge!(template_config)
       .deep_merge!(New.custom_config)
       .deep_merge!({
-        project_name: @name,
-        project_filename: to_filename(@name),
+        project: {
+          name: @name,
+          filename: to_filename(@name)
+        },
         type: @type.to_s
       })
   end

data/spec/fixtures/custom/.new

@@ -1,5 +1,7 @@
 license: MIT
 custom: true
+project:
+  name: Foo
 developer:
   name: Foo Bar
   email: foo@bar.com

data/spec/lib/new/template_spec.rb

@@ -53,7 +53,7 @@ describe New::Template do
 
       # check project specific options
       expect(options[:type]).to eq('foo_template')
-      expect(options[:project_name]).to eq('new_template')
+      expect(options[:project][:name]).to eq('new_template')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $: << File.expand_path('../../lib', __FILE__)
-require 'new'
 $: << File.expand_path('../../tasks', __FILE__)
 $: << File.expand_path('../fixtures', __FILE__)
+require 'new'
 $: << File.expand_path('tasks', New::CUSTOM_DIR)
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration

data/tasks/gem/gem.rb

@@ -25,7 +25,7 @@ class New::Task::Gem < New::Task
     write_config
     deploy
 
-    New.say "Version #{project_options[:version].green} of the #{project_options[:project_name].green} gem successfully published."
+    New.say "Version #{project_options[:version].green} of the #{project_options[:project][:name].green} gem successfully published."
   end
 
 private
@@ -67,7 +67,7 @@ private
 
     # set defaults
     @gemspec[:date]    = Date.today.to_s
-    @gemspec[:name]    = project_options[:project_name].gsub(' ', '_').underscore
+    @gemspec[:name]    = project_options[:project][:name]
     @gemspec[:version] = project_options[:version]
     @gemspec[:author]  ||= project_options[:developer][:name]
     @gemspec[:email]   ||= project_options[:developer][:email]

data/tasks/gem/gem_spec.rb

@@ -13,7 +13,6 @@ describe New::Task::Gem do
   end
 
   after do
-    New::Task::Gem.any_instance.unstub(:run)
     Dir.chdir @pwd
   end
 
@@ -49,13 +48,13 @@ describe New::Task::Gem do
 
   describe '#render_gemspec_options' do
     before do
-      @gem.stub(:extract_gem_dependencies).and_return(['  s.extract_gem_dependencies'])
+      allow(@gem).to receive(:extract_gem_dependencies).and_return(['  s.extract_gem_dependencies'])
       @gem.instance_variable_set(:@gemspec, {})
       @gem.send(:render_gemspec_options)
     end
 
     after do
-      @gem.unstub(:extract_gem_dependencies)
+      allow(@gem).to receive(:extract_gem_dependencies).and_call_original
     end
 
     it 'should create the gemspec_string option' do
@@ -97,12 +96,12 @@ describe New::Task::Gem do
 
   describe '#write_gemspec' do
     before do
-      @gem.stub(:project_options).and_return({ gemspec_string: 'foo' })
+      allow(@gem).to receive(:project_options).and_return({ gemspec_string: 'foo' })
       @gem.send(:write_gemspec)
     end
 
     after do
-      @gem.unstub(:project_options)
+      allow(@gem).to receive(:project_options).and_call_original
     end
 
     it 'should write a gemspec file' do
@@ -118,7 +117,7 @@ describe New::Task::Gem do
 
   describe '#write_config' do
     before do
-      @gem.stub(:project_options).and_return({
+      allow(@gem).to receive(:project_options).and_return({
         gemspec_string: 'foo',
         foo_files: 'foo',
         bar: 'bar'
@@ -127,7 +126,7 @@ describe New::Task::Gem do
     end
 
     after do
-      @gem.unstub(:project_options)
+      allow(@gem).to receive(:project_options).and_call_original
     end
 
     it 'should update the config file' do

data/templates/js/.new.erb

@@ -0,0 +1,11 @@
+---
+license: <%= license %>
+developer:
+  name: <%= developer.name %>
+  email: <%= developer.email %>
+version: 0.0.0
+project:
+  name: <%= project.name %>
+github:
+  username: <%= github.username %>
+type: js

data/templates/js/LICENSE-MIT.erb

@@ -1,4 +1,4 @@
-Copyright (c) <%= Date.today.year %> <%= developer.name %> <%= project_name %>
+Copyright (c) <%= Date.today.year %> <%= developer.name %>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/templates/js/README.md.erb

@@ -1,4 +1,4 @@
-# <%= project_name %>
+# <%= project.name %>
 
 ## Dependencies
 *
@@ -26,7 +26,7 @@ METHOD ARGUMENT
 
 ```shell
 gem install yuyi
-yuyi https://raw.githubusercontent.com/brewster1134/tiler/master/yuyi_menu
+yuyi -m https://raw.githubusercontent.com/<%= github.username %>/<%= project.filename %>/master/yuyi_menu
 bundle install
 npm install
 bower install

data/templates/js/bower.json.erb

@@ -1,5 +1,5 @@
 {
-  "name": "<%= project_name %>",
+  "name": "<%= project.name %>",
   "dependencies": {},
   "devDependencies": {
     "chai": "latest",

data/templates/js/demo/index.html.erb

@@ -1,12 +1,12 @@
 <html>
   <head>
-    <title><%= project_name %></title>
-    <link type="text/css" rel="stylesheet" media="all" href="../dist/<%= project_filename %>.css"/>
-    <link type="text/css" rel="stylesheet" media="all" href="<%= project_filename %>_demo.css"/>
+    <title><%= project.name %></title>
+    <link type="text/css" rel="stylesheet" media="all" href="../lib/<%= project.filename %>.css"/>
+    <link type="text/css" rel="stylesheet" media="all" href="<%= project.filename %>_demo.css"/>
   </head>
   <body>
   </body>
 
-  <script type="text/javascript" src="../lib/<%= project_filename %>.js"></script>
-  <script type="text/javascript" src="<%= project_filename %>_demo.js"></script>
+  <script type="text/javascript" src="../lib/<%= project.filename %>.js"></script>
+  <script type="text/javascript" src="<%= project.filename %>_demo.js"></script>
 </html>

data/templates/js/spec/[PROJECT.FILENAME]_spec.coffee.erb

@@ -0,0 +1 @@
+describe '<%= project.name %>', ->

data/templates/js/spec/index.html.erb

@@ -1,8 +1,8 @@
 <html>
   <head>
     <link rel="stylesheet" href="/vendor/mocha/mocha.css">
-    <link rel="stylesheet" href="/lib/<%= project_name %>.css">
-    <link rel="stylesheet" href="/.tmp/<%= project_name %>_spec.css">
+    <link rel="stylesheet" href="/lib/<%= project.filename %>.css">
+    <link rel="stylesheet" href="/.tmp/<%= project.filename %>_spec.css">
   </head>
 
   <body>
@@ -26,8 +26,8 @@
     window.expect = chai.expect;
   </script>
 
-  <script src="/lib/<%= project_name %>.js"></script>
-  <script src="/.tmp/<%= project_name %>_spec.js"></script>
+  <script src="/lib/<%= project.filename %>.js"></script>
+  <script src="/.tmp/<%= project.filename %>_spec.js"></script>
 
   <script>
     mocha.run()

data/templates/js/src/{[PROJECT_FILENAME].js.coffee.erb → [PROJECT.FILENAME].coffee.erb}

@@ -1,11 +1,11 @@
 ###
-# * <%= project_name %>
-# * https://github.com/brewster1134/<%= project_filename %>
+# * <%= project.name %>
+# * https://github.com/<%= github.username %>/<%= project.filename %>
 # *
-# * @version 0.0.1
+# * @version <%= version %>
 # * @author <%= developer.name %>
 # * Copyright (c) <%= Date.today.year %>
-# * Licensed under the MIT license.
+# * Licensed under the <%= license %> license.
 ###
 
 ((root, factory) ->

data/templates/js/testem.yml

@@ -1,12 +1,14 @@
 test_page: spec/index.html
 before_tests: |
-  bundle exec coffee -co dist src/*.coffee
+  bundle exec coffee -co lib src/*.coffee
   bundle exec coffee -co .tmp spec/*.coffee
-  bundle exec sass src/*.sass dist
-  bundle exec sass spec/*.sass .tmp
-  bundle exec sass demo/*.sass
+  bundle exec coffee -co demo demo/*.coffee
+  bundle exec sass --update src:lib
+  bundle exec sass --update spec:.tmp
+  bundle exec sass --update demo:demo
 src_files:
-  - demo/*.sass
+  - demo/*_demo.coffee
+  - demo/*_demo.sass
   - spec/*_spec.coffee
   - spec/*_spec.sass
   - spec/index.html
@@ -14,7 +16,7 @@ src_files:
   - src/*.sass
 serve_files:
   - .tmp/*.js
-  - dist/*.js
+  - lib/*.js
 launch_in_dev:
   - phantomjs
 launch_in_ci:

data/templates/js/yuyi_menu

@@ -1,5 +1,5 @@
 sources:
-  - yuyi: https://github.com/brewster1134/Yuyi-Rolls/archive/master.zip
+  yuyi: https://github.com/brewster1134/Yuyi-Rolls/archive/master.zip
 rolls:
   bower:
   bundler:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: new
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryan Brewster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -217,25 +217,23 @@ files:
 - tasks/gem/gem_spec.rb
 - templates/js/.bowerrc
 - templates/js/.gitignore
-- templates/js/.new
+- templates/js/.new.erb
 - templates/js/CHANGELOG.md
 - templates/js/Gemfile
 - templates/js/Guardfile
 - templates/js/LICENSE-MIT.erb
 - templates/js/README.md.erb
 - templates/js/bower.json.erb
-- templates/js/demo/[PROJECT_FILENAME]_demo.css.sass
-- templates/js/demo/[PROJECT_FILENAME]_demo.js.coffee
+- templates/js/demo/[PROJECT.FILENAME]_demo.coffee
+- templates/js/demo/[PROJECT.FILENAME]_demo.sass
 - templates/js/demo/index.html.erb
 - templates/js/lib/README.md
 - templates/js/package.json
-- templates/js/spec/[PROJECT_FILENAME].spec.js.coffee.erb
+- templates/js/spec/[PROJECT.FILENAME]_spec.coffee.erb
+- templates/js/spec/[PROJECT.FILENAME]_spec.sass
 - templates/js/spec/index.html.erb
-- templates/js/spec/vendor/chai.js
-- templates/js/spec/vendor/sinon-chai.js
-- templates/js/spec/vendor/sinon.js
-- templates/js/src/[PROJECT_FILENAME].css.sass
-- templates/js/src/[PROJECT_FILENAME].js.coffee.erb
+- templates/js/src/[PROJECT.FILENAME].coffee.erb
+- templates/js/src/[PROJECT.FILENAME].sass
 - templates/js/testem.yml
 - templates/js/yuyi_menu
 homepage: https://github.com/brewster1134/new

data/templates/js/spec/[PROJECT_FILENAME].spec.js.coffee.erb

@@ -1 +0,0 @@
-describe '<%= project_name %>', ->