half-pipe 0.3.0.alpha.1 → 0.3.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e25db15e868e377f593f10acc4d469b234b8e6a8
-  data.tar.gz: 6a79cc94c56035c15fb9a43a64c3af950283fc38
+  metadata.gz: 9e779c2dd9479a1245d628d0d1b9301df8273d89
+  data.tar.gz: 7f7b736cf0996b856cdf9ef4a04b0bf894e398cc
 SHA512:
-  metadata.gz: 4e2c8314902a381dd4fa1e81a94c3d5a3a8b16d211ce171913e008cebabaa8c171d2e597b2f8543ca22317faada95aa6fd358363f45dca20abffddcdf3bb2d76
-  data.tar.gz: f54a68b26199cbe600a8b0056253eedc79fc68baae72b021204e09c1856fc84aeb8acd0b087ce5a783e48ee483d05635059393ea52f563e6f3257b7b48efeb03
+  metadata.gz: 25d694c6d65fdc4fb58901abc92c64d6e5a59a2cffb59a9cc3fb62f18a1d86e67148e27dc161ea0539fab5c312b858d61820f1a54c62a83524a1536e8acccef7
+  data.tar.gz: 02acde5fa5bf06feabb6c6772f193a4ed29b4ae82421e8038dd4a098e78f7c85fdaf6fa7ac07abe3ccdb04b57c6058f2d7b136e578fe1afb7991285e947b356e

data/README.md

@@ -10,6 +10,16 @@ Half Pipe is a generator to get you up and running quickly with a Grunt setup fo
 
 This initial release assumes you have been using [Grunt.js](http://www.gruntjs.com) in non-Rails apps and would like to start using it in Rails as well. It uses [Bower](http://bower.io) for dependency management, [RequireJS](http://www.requirejs.org) for Javascript modules and Sass for CSS. If you use alternatives to these tools, we'd love to hear from you.
 
+## Alpha Version
+
+**NOTE** This README refers to the current stable version of Half Pipe (v0.2.4 at the time of writing). To use the new, Grunt-based workflow see our [milestones][] and install an alpha version by specifying:
+
+```
+gem 'half-pipe', '~>0.3.0.alpha'
+```
+
+in your Gemfile.
+
 ## Looking for Contributors
 
 If you take a look at our [issue board on waffle.io](http://waffle.io/d-i/half-pipe) you'll see that we have some big plans for future releases of Half Pipe. If you are interested in working on a feature or fixing a bug, please feel free to move the issue to "In Progress" and send a PR when you're ready. If you have ideas or questions, please feel free to [open an issue](https://github.com/d-i/half-pipe/issues/new).
@@ -112,7 +122,7 @@ In this early release if you want to configure anything, you'll have to manually
 
 ## Roadmap
 
-We're currently undergoing some pretty major changes in the Half Pipe workflow. See our [milestones](/d-i/half-pipe/issues/milestones) for what's coming in the near future.
+We're currently undergoing some pretty major changes in the Half Pipe workflow. See our [milestones][] for what's coming in the near future.
 
 ## Future Features
 
@@ -128,3 +138,5 @@ We're currently undergoing some pretty major changes in the Half Pipe workflow.
 - BYO support for less common languages
 - Automatic symlinking of CSS files within bower to SCSS partials within `app/styles`
 - Read .bowerrc for Bower directory
+
+[milestones]: http://github.com/d-i/half-pipe/issues/milestones

data/app/helpers/half_pipe_helper.rb

@@ -1,12 +1,15 @@
 module HalfPipeHelper
 
-  def requirejs_include_tag(script, options={})
-    script, options = if Rails.application.config.half_pipe.env.debug?
-               ["/components/requirejs/require.js", { data: { main: "/assets/scripts/application.js" } }]
-             else
-               ["/assets/scripts/application.js", {}]
-             end
-    javascript_include_tag script, options
+  def javascript_include_tag(source, options={})
+    base = File.basename(source)
+    source = File.join("/assets", "scripts", base)
+    super source, options
+  end
+
+  def image_tag(source, options={})
+    base = File.basename(source)
+    source = File.join("/assets", "images", base)
+    super(source, options)
   end
 
 end

data/lib/generators/half_pipe/install_generator.rb

@@ -8,20 +8,7 @@ module HalfPipe
         @_half_pipe_source_root ||= File.expand_path("../templates", __FILE__)
       end
 
-      def welcome
-        say "*" * 120
-        say
-        say "Welcome to Half Pipe!"
-        say "I'm going to take some preliminary setup steps to get you going."
-        say
-        say "*" * 120
-      end
-
       def create_config_files
-        say
-        say "First I need to generate config files for NPM & Bower. This is where you'll put your asset building and browser dependencies in the future."
-        say
-        sleep 3
         template "package.json", "package.json"
         template "_bowerrc", ".bowerrc"
         template "bower.json", "bower.json"
@@ -31,10 +18,6 @@ module HalfPipe
       end
 
       def remove_sprockets
-        say
-        say "Half Pipe uses app/scripts and app/styles for your JavaScript and Stylesheet templates. I need to update your application layout to point to those, plus remove any traces of sprockets."
-        say
-        sleep 3
         comment_lines "config/application.rb", %r{sprockets/railtie}
 
         railties_requires = File.read(File.join(self.class.source_root, "railties.rb"))
@@ -45,15 +28,11 @@ module HalfPipe
       end
 
       def insert_includes_into_layout
-        insert_into_file "app/views/layouts/application.html.erb", %Q{  <%= requirejs_include_tag "/scripts/application.js" %>\n  }, before: "</body>"
-        insert_into_file "app/views/layouts/application.html.erb", %Q{  <%= stylesheet_link_tag "/styles/main.css" %>\n  }, before: "</head>"
+        insert_into_file "app/views/layouts/application.html.erb", %Q{  <%= requirejs_include_tag "/assets/scripts/application.js" %>\n  }, before: "</body>"
+        insert_into_file "app/views/layouts/application.html.erb", %Q{  <%= stylesheet_link_tag "/assets/styles/main" %>\n  }, before: "</head>"
       end
 
       def generate_scripts
-        say
-        say "Now I can generate some starter templates for your requirejs configuration and Sass imports"
-        say
-        sleep 3
         empty_directory "app/scripts"
 
         template "app/scripts/main.js"
@@ -69,10 +48,6 @@ module HalfPipe
       end
 
       def generate_task_config_files
-        say
-        say "All of your Grunt tasks will be configured by files in #{Rails.root.join("tasks/options")}. After I'm done, have a look there to see if you need to customize anything."
-        say
-        sleep 3
         empty_directory "tasks/options"
 
         inside "tasks/options" do
@@ -107,13 +82,7 @@ module HalfPipe
 
       def finalize
 
-        say
-        say "Congratulations!".upcase
-        say
-
         say "You may now safely migrate your assets to app/scripts and/or app/styles. Feel free to delete app/assets/javascripts and app/assets/stylesheets when you're done."
-        say
-        say "To start developing, fire up a development server with 'grunt server:debug'. You can continue to use 'http://localhost:3000' in your browser to access your app. I will take care of rebuilding your assets and restarting your Rails server as you work. Enjoy!"
       end
 
       protected

data/lib/generators/half_pipe/templates/Gruntfile.js

@@ -28,9 +28,13 @@ module.exports = function(grunt) {
   // Default task.
   grunt.registerTask('default', 'build:debug');
 
-  grunt.registerTask('build:debug', ['copy:prepare', 'sass:debug', 'copy:stage']);
-  grunt.registerTask('build:public', ['copy:prepare', 'sass:public', 'copy:stage', 'requirejs:public', 'copy:public']);
+  // Configure asset building pipeline
+  grunt.registerTask('build', ['build:debug']);
+  grunt.registerTask('build:debug', ['clean', 'copy:prepare', 'requirejs:debug', 'sass:debug']);
+  grunt.registerTask('build:public', ['clean', 'copy:prepare', 'requirejs:public', 'sass:public', 'copy:finalize']);
 
+  // Configure preview server
+  grunt.registerTask('server', ['server:debug']);
   grunt.registerTask('server:debug', ['build:debug', 'configureProxies', 'connect:debug', 'rails:server:start', 'watch']);
   grunt.registerTask('server:public', ['build:public', 'configureProxies', 'connect:public:keepalive']);
 

data/lib/generators/half_pipe/templates/bower.json

@@ -3,6 +3,7 @@
   "dependencies": {
     "html5shiv": "latest",
     "requirejs": "latest",
+    "jquery-ujs": "latest",
     "normalize-css": "latest"
   }
 }

data/lib/generators/half_pipe/templates/config/build.js

@@ -0,0 +1,11 @@
+requirejs.config({
+  wrap: true,
+  insertRequire: ['<%= main_module_name %>'],
+  deps: ['<%= main_module_name %>'],
+  shim: {
+  },
+  paths: {
+    '<%= main_module_name %>': 'main'
+  }
+})
+

data/lib/generators/half_pipe/templates/tasks/options/connect.js

@@ -8,7 +8,7 @@ module.exports = {
   },
   debug: {
     options: {
-      base: ["<%%= dirs.tmp %>/public", "<%%= bowerOpts.directory %>"]
+      base: ["<%%= dirs.tmp %>/public", "<%%= bowerOpts.directory || 'bower_components' %>"]
     }
   },
   "public": {

data/lib/generators/half_pipe/templates/tasks/options/copy.js

@@ -10,22 +10,20 @@ module.exports = {
       cwd: 'app/images',
       src: '**/*',
       dest: '<%%= dirs.tmp %>/prepare/assets/images'
-    }]
-  },
-  stage: {
-    files: [{
+    }, {
       expand: true,
-      cwd: '<%%= dirs.tmp %>/prepare',
+      cwd: 'app/styles',
       src: '**/*',
-      dest: '<%%= dirs.tmp %>/public'
+      dest: '<%%= dirs.tmp %>/prepare/assets/styles'
     }]
   },
-  "public": {
+  finalize: {
     files: [{
       expand: true,
-      cwd: '<%%= dirs.tmp %>/prepare',
-      src: ['**/*', '!**/*.js'],
+      cwd: '<%%= dirs.tmp %>/public',
+      src: ['assets/**/*'],
       dest: 'public/'
     }]
   }
+  }
 };

data/lib/generators/half_pipe/templates/tasks/options/requirejs.js

@@ -1,45 +1,19 @@
 module.exports = {
+  options: {
+    name: "../../../../../node_modules/almond/almond",
+    out: "<%%= dirs.tmp %>/public/assets/scripts/application.js",
+    baseUrl: "<%%= dirs.tmp %>/prepare/assets/scripts",
+    mainConfigFile: "config/build.js"
+  },
+  debug: {
+    options: {
+      useSourceUrl: true,
+      optimize: "none",
+    }
+  },
   "public": {
     options: {
-      name: "../../../../../node_modules/almond/almond",
-      baseUrl: "<%%= dirs.tmp %>/public/assets/scripts",
-      out: "public/assets/scripts/application.js",
-      wrap: true,
-      insertRequire: ['<%= main_module_name %>'],
-      deps: ['<%= main_module_name %>'],
-      shim: {
-        'jquery': { exports: '$' },
-        'jquery.textareaAutogrow': {
-          deps: ['jquery']
-        },
-        'pickadate/picker.date': {
-          deps: ['pickadate/picker'],
-          exports: 'Picker'
-        },
-        'pickadate/picker.time': {
-          deps: ['pickadate/picker'],
-          exports: 'Picker'
-        },
-        'pickadate/picker': {
-          deps: ['jquery'],
-          exports: 'Picker'
-        }
-      },
-      paths: {
-        '<%= main_module_name %>': 'main',
-        'flight': '../../../../../bower_components/flight',
-        'jquery': '../../../../../bower_components/jquery/jquery',
-        'lodash': '../../../../../bower_components/lodash/lodash',
-        'jquery-ujs': '../../../../../bower_components/jquery-ujs/src/rails',
-        'jquery.fileupload': '../../../../../bower_components/jquery-file-upload/js/jquery.fileupload',
-        'jquery.ui.widget': '../../../../../bower_components/jquery-file-upload/js/vendor/jquery.ui.widget',
-        'jquery.textareaAutogrow': '../../../../../bower_components/jquery.textareaAutogrow/jquery.textareaAutogrow',
-        'bacon': '../../../../../bower_components/bacon/dist/Bacon',
-        'bacon.jquery': '../../../../../bower_components/bacon.jquery/dist/bacon.jquery',
-        'zeroclipboard': '../../../../../bower_components/zeroclipboard/ZeroClipboard',
-        'pickadate': '../../../../../bower_components/pickadate/lib'
-
-      }
+      optimize: "uglify2"
     }
   }
 };

data/lib/generators/half_pipe/templates/tasks/options/sass.js

@@ -1,19 +1,21 @@
 module.exports = {
   options: {
-    style: 'expanded',
     require: ['sass-css-importer'],
     loadPath: ['<%%= bowerOpts.directory || "bower_components" %>'],
-    bundleExec: true
+    bundleExec: true,
   },
   debug: {
-    src: 'app/styles/main.scss',
-    dest: '<%%= dirs.tmp %>/prepare/assets/styles/main.css'
+    src: '<%%= dirs.tmp %>/prepare/assets/styles/main.scss',
+    dest: '<%%= dirs.tmp %>/public/assets/styles/main.css',
+    options: {
+      style: 'expanded'
+    }
   },
   "public": {
+    src: '<%%= dirs.tmp %>/prepare/assets/styles/main.scss',
+    dest: '<%%= dirs.tmp %>/public/assets/styles/main.css',
     options: {
       style: 'compressed'
-    },
-    src: 'app/styles/main.scss',
-    dest: '<%%= dirs.tmp %>/prepare/assets/styles/main.css'
+    }
   }
 };

data/lib/half-pipe/version.rb

@@ -1,5 +1,5 @@
 module Half
   module Pipe
-    VERSION = "0.3.0.alpha.1"
+    VERSION = "0.3.0.alpha.2"
   end
 end

data/lib/sass/half_pipe_functions.rb

@@ -1,7 +1,11 @@
 module Sass::Script::Functions
 
   def image_url(path)
-     Sass::Script::String.new("url(#{File.join("/images", path.value)})")
+     Sass::Script::String.new("url(#{File.join("/assets/images", path.value)})")
+  end
+
+  def image_path(path)
+     Sass::Script::String.new(File.join("/assets/images", path.value))
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: half-pipe
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha.1
+  version: 0.3.0.alpha.2
 platform: ruby
 authors:
 - Joe Fiorini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -52,70 +52,15 @@ files:
 - ROADMAP.md
 - Rakefile
 - app/helpers/half_pipe_helper.rb
-- examples/rails/.bowerrc
-- examples/rails/.gitignore
-- examples/rails/.jshintrc
-- examples/rails/Gemfile
-- examples/rails/Gruntfile.js
-- examples/rails/README.rdoc
-- examples/rails/Rakefile
-- examples/rails/app/controllers/application_controller.rb
-- examples/rails/app/controllers/concerns/.keep
-- examples/rails/app/controllers/posts_controller.rb
-- examples/rails/app/helpers/application_helper.rb
-- examples/rails/app/mailers/.keep
-- examples/rails/app/models/.keep
-- examples/rails/app/models/concerns/.keep
-- examples/rails/app/models/post.rb
-- examples/rails/app/scripts/application.js
-- examples/rails/app/scripts/features/posts.js
-- examples/rails/app/scripts/main.js
-- examples/rails/app/styles/main.scss
-- examples/rails/app/views/layouts/application.html.erb
-- examples/rails/app/views/posts/index.html.erb
-- examples/rails/app/views/posts/show.html.erb
-- examples/rails/bin/bundle
-- examples/rails/bin/rails
-- examples/rails/bin/rake
-- examples/rails/bower.json
-- examples/rails/config.ru
-- examples/rails/config/application.rb
-- examples/rails/config/boot.rb
-- examples/rails/config/environment.rb
-- examples/rails/config/environments/development.rb
-- examples/rails/config/environments/production.rb
-- examples/rails/config/environments/test.rb
-- examples/rails/config/initializers/backtrace_silencers.rb
-- examples/rails/config/initializers/filter_parameter_logging.rb
-- examples/rails/config/initializers/inflections.rb
-- examples/rails/config/initializers/mime_types.rb
-- examples/rails/config/initializers/sass.rb
-- examples/rails/config/initializers/secret_token.rb
-- examples/rails/config/initializers/session_store.rb
-- examples/rails/config/initializers/wrap_parameters.rb
-- examples/rails/config/locales/en.yml
-- examples/rails/config/routes.rb
-- examples/rails/db/seeds.rb
-- examples/rails/lib/assets/.keep
-- examples/rails/lib/tasks/.keep
-- examples/rails/log/.keep
-- examples/rails/package.json
-- examples/rails/public/404.html
-- examples/rails/public/422.html
-- examples/rails/public/500.html
-- examples/rails/public/favicon.ico
-- examples/rails/public/robots.txt
-- examples/rails/vendor/assets/javascripts/.keep
-- examples/rails/vendor/assets/stylesheets/.keep
 - half-pipe.gemspec
 - lib/generators/half_pipe/install_generator.rb
 - lib/generators/half_pipe/templates/Gruntfile.js
 - lib/generators/half_pipe/templates/_bowerrc
 - lib/generators/half_pipe/templates/_jshintrc
-- lib/generators/half_pipe/templates/app/scripts/application.js
 - lib/generators/half_pipe/templates/app/scripts/main.js
 - lib/generators/half_pipe/templates/app/styles/main.scss
 - lib/generators/half_pipe/templates/bower.json
+- lib/generators/half_pipe/templates/config/build.js
 - lib/generators/half_pipe/templates/config/half-pipe.json
 - lib/generators/half_pipe/templates/package.json
 - lib/generators/half_pipe/templates/railties.rb

data/examples/rails/.bowerrc

@@ -1,3 +0,0 @@
-{
-  "json": "bower.json"
-}

data/examples/rails/.gitignore

@@ -1,21 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
-
-node_modules
-components
-
-.sass-cache

data/examples/rails/.jshintrc

@@ -1,34 +0,0 @@
-{
-  "camelcase": true,
-  "indent": 2,
-  "white": false,
-  "curly": true,
-  "eqeqeq": true,
-  "immed": true,
-  "latedef": true,
-  "newcap": false,
-  "noarg": true,
-  "sub": true,
-  "undef": true,
-  "boss": true,
-  "eqnull": true,
-  "browser": true,
-  "globals": {
-    "test": true,
-    "asyncTest": true,
-    "start": true,
-    "expect": true,
-    "module": true,
-    "define": true,
-    "sinon": true,
-    "require": true,
-    "console": true,
-    "Class": true,
-    "Events": true,
-    "Options": true,
-    "Element": true,
-    "$": true,
-    "$$": true
-  }
-}
-

data/examples/rails/Gemfile

@@ -1,38 +0,0 @@
-source 'https://rubygems.org'
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.0.rc1'
-
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
-
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
-
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.0.1'
-
-gem 'half-pipe', path: '../../'
-
-group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', require: false
-end
-
-# Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Use Capistrano for deployment
-# gem 'capistrano', group: :development
-
-# Use debugger
-# gem 'debugger', group: [:development, :test]

data/examples/rails/Gruntfile.js

@@ -1,67 +0,0 @@
-/*global module:false*/
-module.exports = function(grunt) {
-
-
-  // Project configuration.
-  grunt.initConfig({
-    // Metadata.
-    pkg: grunt.file.readJSON('package.json'),
-
-    jshint: {
-      options: {
-        jshintrc: '.jshintrc'
-      },
-      gruntfile: {
-        src: 'Gruntfile.js'
-      }
-    },
-
-    sass: {
-      options: {
-        style: 'expanded',
-        require: ['./config/initializers/sass']
-      },
-      'tmp/styles/main.css': [
-        'app/styles/main.scss'
-      ]
-    },
-
-    cssmin: {
-      'public/styles/main.css': 'tmp/styles/main.css'
-    },
-
-    requirejs: {
-      options: {
-        baseUrl: "app/scripts",
-        mainConfigFile: "app/scripts/application.js",
-        name: "main",
-        out: "public/scripts/application.js"
-      },
-      scripts: {
-      }
-    },
-
-    copy: {
-      'public/scripts/require.js': 'components/requirejs/require.js'
-    },
-
-    clean: ['public/assets/', 'tmp/']
-
-  });
-
-  // These plugins provide necessary tasks.
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-sass');
-  grunt.loadNpmTasks('grunt-contrib-cssmin');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-requirejs');
-
-  // Default task.
-  grunt.registerTask('default', 'build');
-
-  // Build task.
-  grunt.registerTask('build', ['jshint', 'sass', 'cssmin', 'copy', 'requirejs']);
-
-};
-

data/examples/rails/README.rdoc

@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/examples/rails/Rakefile

@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Blog::Application.load_tasks

data/examples/rails/app/controllers/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-end

data/examples/rails/app/controllers/posts_controller.rb

@@ -1,9 +0,0 @@
-class PostsController < ApplicationController
-  def index
-    @posts = Post.all
-  end
-
-  def show
-    @post = Post.find(params[:id])
-  end
-end

data/examples/rails/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end