yupi 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a425da02a19ca50fc7bf4fd530379bffb69860
-  data.tar.gz: bdb368a80b12d9f87a3c3c7e5a0d6e4c478ecf8f
+  metadata.gz: 428147794641c0c091a2d2734782c270bd5741dc
+  data.tar.gz: fa71b93661ddb31106379aca9c5de04c156120e9
 SHA512:
-  metadata.gz: f20ab6d9ca37e7c8f23018888663adecc9233698fff34fd9a1c918bade7c0bb2e93961f5c01ea0cc3a85a51620a3a7dad1fd87d885cbd1189e78068d5e603ecc
-  data.tar.gz: a0952c7f47dc027407a8c1268dd8df87c33735e9cff15e835af3ba72cab373114598d4f62b6df766c9532802a9cfc3b21bba6fed571b2edc882173a95642588a
+  metadata.gz: 55b045a30ae6c712674dca2d2cc3d6092dc792228d16a7e69c8ea103810dcf227418c0a5608fd79ec766ffcefc5bc4cbe56014fa5d3b6ba1e89a17423fde15c0
+  data.tar.gz: e046965ae2aef9f6578c46900313bb9362b078a083d99692ad96d09adc54b39e8d6452b71421df57b4c29ae322b1af8b18a890033a2ec86f32b2d21f7f1d49dd

data/lib/yupi/app_builder.rb

@@ -123,29 +123,29 @@ module Yupi
     def create_partials
       empty_directory 'app/views/application'
 
-      copy_file 'views/application/_flashes.html.erb',
-        'app/views/application/_flashes.html.erb'
-      copy_file 'views/application/_javascript.html.erb',
-        'app/views/application/_javascript.html.erb'
-      copy_file 'views/application/_navigation.html.erb',
-        'app/views/application/_navigation.html.erb'
-      copy_file 'views/application/_navigation_links.html.erb',
-        'app/views/application/_navigation_links.html.erb'
-      copy_file 'views/application/_analytics.html.erb',
-        'app/views/application/_analytics.html.erb'
-      copy_file 'views/application/_footer.html.erb',
-        'app/views/application/_footer.html.erb'
+      copy_file 'views/application/_flashes.html.haml',
+        'app/views/application/_flashes.html.haml'
+      copy_file 'views/application/_javascript.html.haml',
+        'app/views/application/_javascript.html.haml'
+      copy_file 'views/application/_navigation.html.haml',
+        'app/views/application/_navigation.html.haml'
+      copy_file 'views/application/_navigation_links.html.haml',
+        'app/views/application/_navigation_links.html.haml'
+      copy_file 'views/application/_analytics.html.haml',
+        'app/views/application/_analytics.html.haml'
+      copy_file 'views/application/_footer.html.haml',
+        'app/views/application/_footer.html.haml'
     end
 
     def create_home_page
-      copy_file 'views/pages/home.html.erb',
-        'app/views/pages/home.html.erb'
+      copy_file 'views/pages/home.html.haml',
+        'app/views/pages/home.html.haml'
     end
 
     def create_application_layout
-      template 'views/layouts/application.html.erb.erb',
-        'app/views/layouts/application.html.erb',
-        force: true
+      remove_file 'app/views/layouts/application.html.erb'
+      copy_file 'views/layouts/application.html.haml',
+        'app/views/layouts/application.html.haml'
     end
 
     def use_postgres_config_template

data/lib/yupi/version.rb

@@ -1,5 +1,5 @@
 module Yupi
   RAILS_VERSION = "4.2.1"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/features/new_project_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Build a new project with default configuration' do
+RSpec.feature 'Build a new project with default configuration' do
   scenario 'specs pass', :smoke do
     run_yupi
 

data/templates/Gemfile.erb

@@ -7,6 +7,7 @@ gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "email_validator"
 gem "figaro"
+gem "haml-rails"
 gem "high_voltage"
 gem "i18n-tasks"
 gem "jquery-rails"
@@ -42,6 +43,7 @@ group :test do
   gem "launchy"
   gem "poltergeist"
   gem "shoulda-matchers", require: false
+  gem "simplecov", require: false
   gem "timecop"
   gem "webmock"
 end

data/templates/spec/spec_helper.rb

@@ -1,18 +1,24 @@
+if ENV.fetch("COVERAGE", false)
+  require "simplecov"
+  SimpleCov.start "rails"
+end
+
 require "webmock/rspec"
 
 # http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
   config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
     mocks.verify_partial_doubles = true
   end
 
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
-  config.disable_monkey_patching!
 
   if config.files_to_run.one?
     config.default_formatter = 'doc'

data/templates/views/application/{_analytics.html.erb → _analytics.html.haml}

@@ -1,7 +1,5 @@
-<% if ENV.key?("SEGMENT_KEY") %>
-  <script type="text/javascript">
+- if ENV.key?("SEGMENT_KEY")
+  :javascript
     window.analytics=window.analytics||[],window.analytics.methods=["identify","group","track","page","pageview","alias","ready","on","once","off","trackLink","trackForm","trackClick","trackSubmit"],window.analytics.factory=function(t){return function(){var a=Array.prototype.slice.call(arguments);return a.unshift(t),window.analytics.push(a),window.analytics}};for(var i=0;i<window.analytics.methods.length;i++){var key=window.analytics.methods[i];window.analytics[key]=window.analytics.factory(key)}window.analytics.load=function(t){if(!document.getElementById("analytics-js")){var a=document.createElement("script");a.type="text/javascript",a.id="analytics-js",a.async=!0,a.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n)}},window.analytics.SNIPPET_VERSION="2.0.9",
-    window.analytics.load("<%= ENV["SEGMENT_KEY"] %>");
+    window.analytics.load("#{ENV["SEGMENT_KEY"]}");
     window.analytics.page();
-  </script>
-<% end %>

data/templates/views/application/_flashes.html.haml

@@ -0,0 +1,4 @@
+- flash.each do |name, msg|
+  %div{:class => "alert alert-#{name == "notice" ? "success" : "danger"}"}
+    %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "button"} ×
+    = content_tag :div, msg, :id => "flash_#{name}"

data/templates/views/application/_footer.html.haml

@@ -0,0 +1,9 @@
+#footer
+  .container
+    .row.footer-first-row
+      .col-xs-12.text-center
+        %p
+          %small
+            © #{Time.now.year} - Yourself!
+            %br/
+            Assembled with #{link_to "Yupi", "https://github.com/Anadea/yupi"}

data/templates/views/application/_javascript.html.haml

@@ -0,0 +1,8 @@
+= javascript_include_tag :application
+= yield :javascript
+= render "analytics"
+
+- if Rails.env.test?
+  = javascript_tag do
+    $.fx.off = true;
+    $.ajaxSetup({ async: false });

data/templates/views/application/_navigation.html.haml

@@ -0,0 +1,12 @@
+%nav.navbar.navbar-default
+  .container
+    .navbar-header
+      %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", :type => "button"}
+        %span.sr-only Toggle navigation
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+      = link_to 'Home', root_path, class: 'navbar-brand'
+    .collapse.navbar-collapse
+      %ul.nav.navbar-nav
+        = render 'navigation_links'

data/templates/views/application/_navigation_links.html.haml

@@ -0,0 +1,2 @@
+%li= link_to "Link 1", "#"
+%li= link_to "Link 2", "#"

data/templates/views/layouts/application.html.haml

@@ -0,0 +1,23 @@
+!!!
+%html
+  %head
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %meta{:charset => "utf-8"}/
+    %meta{:content => "NOODP", :name => "ROBOTS"}/
+    %meta{:content => "initial-scale=1", :name => "viewport"}/
+    %title= title
+    = stylesheet_link_tag :application, media: "all"
+    = csrf_meta_tags
+  %body
+    #wrap
+      %header
+        = render 'navigation'
+      .container
+        .row
+          .col-sm-6.col-sm-offset-3.text-center
+            = render 'flashes'
+        .row
+          .col-sm-12
+            = yield
+    = render 'footer'
+    = render 'javascript'

data/templates/views/pages/home.html.haml

@@ -0,0 +1,4 @@
+%h1
+  %i.fa.fa-home
+  Home Page
+  %small views/pages/home.html.erb

data/yupi.gemspec

@@ -30,6 +30,6 @@ to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Yupi::RAILS_VERSION
 
-  s.add_development_dependency 'rspec', '~> 2.0'
+  s.add_development_dependency 'rspec', '>= 3.2.0', '<4'
   s.add_development_dependency 'capybara', '~> 2.2', '>= 2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yupi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - anadea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,22 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -131,14 +137,14 @@ files:
 - templates/spec/support/i18n.rb
 - templates/tasks/bundler_audit.rake
 - templates/tasks/development_seeds.rake
-- templates/views/application/_analytics.html.erb
-- templates/views/application/_flashes.html.erb
-- templates/views/application/_footer.html.erb
-- templates/views/application/_javascript.html.erb
-- templates/views/application/_navigation.html.erb
-- templates/views/application/_navigation_links.html.erb
-- templates/views/layouts/application.html.erb.erb
-- templates/views/pages/home.html.erb
+- templates/views/application/_analytics.html.haml
+- templates/views/application/_flashes.html.haml
+- templates/views/application/_footer.html.haml
+- templates/views/application/_javascript.html.haml
+- templates/views/application/_navigation.html.haml
+- templates/views/application/_navigation_links.html.haml
+- templates/views/layouts/application.html.haml
+- templates/views/pages/home.html.haml
 - yupi.gemspec
 homepage: http://github.com/Anadea/yupi
 licenses:

data/templates/views/application/_flashes.html.erb

@@ -1,6 +0,0 @@
-<% flash.each do |name, msg| %>
-<div class="alert alert-<%= name == "notice" ? "success" : "danger" %>">
-  <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-  <%= content_tag :div, msg, :id => "flash_#{name}" %>
-</div>
-<% end %>

data/templates/views/application/_footer.html.erb

@@ -1,17 +0,0 @@
-<div id="footer">
-  <div class="container">
-
-    <div class="row footer-first-row">
-
-      <div class="col-xs-12 text-center">
-        <p><small>
-          &copy; <%= Time.now.year %> - Yourself!
-          <br/>
-          Assembled with <%= link_to "Yupi", "https://github.com/Anadea/yupi" %>
-        </small></p>
-      </div>
-
-    </div>
-
-  </div>
-</div>

data/templates/views/application/_javascript.html.erb

@@ -1,12 +0,0 @@
-<%= javascript_include_tag :application %>
-
-<%= yield :javascript %>
-
-<%= render "analytics" %>
-
-<% if Rails.env.test? %>
-  <%= javascript_tag do %>
-    $.fx.off = true;
-    $.ajaxSetup({ async: false });
-  <% end %>
-<% end %>

data/templates/views/application/_navigation.html.erb

@@ -1,18 +0,0 @@
-<nav class="navbar navbar-default">
-  <div class="container">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <%= link_to 'Home', root_path, class: 'navbar-brand' %>
-    </div>
-    <div class="collapse navbar-collapse">
-      <ul class="nav navbar-nav">
-        <%= render 'navigation_links' %>
-      </ul>
-    </div>
-  </div>
-</nav>

data/templates/views/application/_navigation_links.html.erb

@@ -1,2 +0,0 @@
-<li><%= link_to "Link 1", "#" %></li>
-<li><%= link_to "Link 2", "#" %></li>

data/templates/views/layouts/application.html.erb.erb

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <meta name="ROBOTS" content="NOODP" />
-  <meta name="viewport" content="initial-scale=1" />
-  <%%#
-    Configure default and controller-, and view-specific titles in
-    config/locales/en.yml. For more see:
-    https://github.com/calebthompson/title#usage
-  %>
-  <title><%%= title %></title>
-  <%%= stylesheet_link_tag :application, media: "all" %>
-  <%%= csrf_meta_tags %>
-</head>
-
-<body>
-  <div id="wrap">
-    <header>
-      <%%= render 'navigation' %>
-    </header>
-
-    <div class="container">
-
-      <div class="row">
-        <div class="col-sm-6 col-sm-offset-3 text-center">
-          <%%= render 'flashes' %>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-sm-12">
-          <%%= yield %>
-        </div>
-      </div>
-
-    </div>
-  </div>
-
-  <%%= render 'footer' %>
-  <%%= render 'javascript' %>
-</body>
-</html>

data/templates/views/pages/home.html.erb

@@ -1 +0,0 @@
-<h1><i class="fa fa-home"></i> Home Page <small>views/pages/home.html.erb</small></h1>