zwr 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332a0129734efb42cbb5a1e0a7f585b39cb6b554
-  data.tar.gz: d2d83a56c689f8459698dacb9ab50ca4c6f5a660
+  metadata.gz: bd8b8260623b9781b10b84b27234a20d94dcd487
+  data.tar.gz: 3da65509bd7b4444b7fa150a355bc4ce8b8c9ce4
 SHA512:
-  metadata.gz: a3aa135df0bc04d4901ccb0c1a2b9ce42b28983c4788c1e4611ca9f6666b71deac29218982d8569b36cab50db67befc8d77edadbb9f93d7576fd99cab10db837
-  data.tar.gz: 11c355f2f1743ef50100dacd09063fa583b532f7fdd743f0e1bcb050a9608ac56d222bec7a912b359c62f8744c7ce2c7e33063ed3ac76cd2ad6e32e89e8214fd
+  metadata.gz: 767a6522e1d4b35f58b7dcfae83b359652321bf5c484028e580e634530f3de200ad112bd49b73ebfcad396c7578b55249fc90c0f50b6ff7a4d1c769f75869519
+  data.tar.gz: 25018df64c4c11cc6eae8614f98a69d5c97f148705888a085bbaf69169546a436dd705363dec11a3931c934f52a14f85c0a002003987d2f44cab129929a5dee9

data/app/assets/stylesheets/{zwr.css.scss → zwr.css.scss.erb}

@@ -12,5 +12,5 @@
 }
 
 body {
-  background: #F6F6F6 url(/assets/bg.png) repeat-x;
+  background: #F6F6F6 url(<%= asset_path 'bg.png' %>) repeat-x;
 }

data/bin/zwr

@@ -8,6 +8,8 @@ require 'rake'
 @options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: zwr new PROJECT_NAME [options]"
+  opts.separator ""
+  opts.separator "Specific options:"
 
   opts.on("-v", "--[no-]verbose", "Run verbosely, will print really a lot of output") do |v|
     @options[:verbose] = v
@@ -18,6 +20,25 @@ OptionParser.new do |opts|
                                      install missing gems. Useful only for debugging templates.)) do |v|
     @options[:bundle] = not(v)
   end
+  
+  @options[:activerecord] = true
+  opts.on("--skip-active-record", %(Skip activerecord. Use this if you will use Mongo.)) do |v|
+    @options[:activerecord] = not(v)
+  end
+
+  opts.on("-r", "--ruby RUBY_VER",
+          "Set ruby version in .rvmrc") do |ruby_ver|
+    @options[:ruby_ver] = ruby_ver
+  end
+
+  @options[:mongoid] = false
+  opts.on("--mongoid",
+          "Use MongoDB with Mongoid gem") do |v|
+    @options[:mongoid] = v
+    if @options[:mongoid]
+      @options[:activerecord] = false
+    end
+  end
 end.parse!
 
 def putsv txt
@@ -43,7 +64,7 @@ when 'new'
     puts "You are in a git repo, and that is not good!"
   else
     puts "creating and initializing new app #{ARGV[1]}"
-    `rails new #{ARGV[1]} --skip-bundle`
+    putsv `rails new #{ARGV[1]} --skip-bundle --skip-spring #{"--skip-active-record" if not @options[:activerecord]}`
     
     Dir.chdir ARGV[1]
     putsv "Gemfile as we like it!"
@@ -68,8 +89,10 @@ when 'new'
     `echo "gem 'html2haml'" >> Gemfile`
     
     # Following are for Mongo only, will add it later
-    #gem 'mongoid', '~> 4.0.0.beta1',github: 'mongoid/mongoid'
-    #gem 'bson_ext'
+    if @options[:mongoid]
+      `echo "gem 'mongoid', '~> 4.0.0',github: 'mongoid/mongoid'" >> Gemfile`
+      `echo "gem 'bson_ext'" >> Gemfile`
+    end
     
     `echo "gem 'factory_girl_rails', '~> 4.0'" >> Gemfile`
     
@@ -77,28 +100,37 @@ when 'new'
     `echo "gem 'tzinfo', platforms: [:mingw, :mswin, :x64_mingw]" >> Gemfile`
 
     putsv "README as we like it!"
-    `rm README.rdoc`
+    putsv `rm README.rdoc`
     `echo "Application #{ARGV[1]} generated bu the zwr generator." > README.markdown`
 
     if @options[:bundle]
       putsv "bundling up... This may take a few minutes..."
-      `bundle install`
+      putsv `bundle install`
     end
     putsv "zwring..."
-    puts `rake zwr:install`
-    putsv "git it up"
-    `git init`
-    `git add -A`
-    `git commit -sm "initial commit - zwr new #{ARGV[1]}"`
-    `git remote add origin git@github.com:zmilojko/#{ARGV[1]}.git`
+    putsv `rake zwr:install`
+    if @options[:ruby_ver]
+      putsv "creating .ruby-version"
+      `rvm --ruby-version use #{@options[:ruby_ver]} >> .ruby-version`
+    end
+    if @options[:mongoid]
+      putsv "configuration for mongoid"
+      `rails g mongoid:config`
+    end
     putsv "database generation"
-    `rake db:migrate`
+    putsv `rake db:migrate`
     putsv "praxing"
-    `prax link`
-    `prax start`
+    putsv `prax link`
+    putsv `prax start`
+    putsv "git it up"
+    putsv `git init`
+    putsv `git add -A`
+    putsv `git commit -sm "initial commit - zwr new #{ARGV[1]}"`
+    putsv `git remote add origin git@github.com:zmilojko/#{ARGV[1]}.git`
     puts "Completed. If there was no errors above, you should be good to go!"
     puts "In your browser, open http://#{ARGV[1]}.dev"
   end
+
 when 'deploy'
   if ARGV.length < 2
     puts "Not enough parameters"

data/lib/tasks/zwr.rake

@@ -1,6 +1,47 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'rake'
+#require 'rails/generators'
+
+class Pathname
+  def remove_line(line)
+    insert(text: "", instead_of: line)
+  end
+  
+  # Will insert LINES after or instead of the LINE that matches given argument
+  def insert(text: nil, after: nil, instead_of: nil, before: nil,  for_each_line: false)
+    raise "You must specify text: argument or give a block that will preform the writing" unless text or block_given?
+    raise "You cannot specify both after: and instead_of: arguments. Pick one." if after and instead_of
+    raise "You cannot specify both after: and before: arguments. Pick one." if after and before
+    raise "You cannot specify both instead_of: and before: arguments. Pick one." if instead_of and before
+    if after || instead_of || before
+      content = File.read(self)
+      File.open(self, "w") do |file|
+        content.lines.each do |line|
+          if line.match(after || instead_of || before)
+            file.puts line if after
+            if text 
+              file.puts text if text != ""
+            else
+              yield file, line
+            end
+            file.puts line if before
+          else
+            file.puts line
+          end
+        end
+      end
+    else
+      File.open(self, "a") do |file|
+        if text 
+          file.puts text
+        else
+          yield file
+        end
+      end
+    end
+  end
+end
 
 namespace :zwr do
   desc "installs zwr gem and features into a new app"
@@ -93,6 +134,10 @@ namespace :zwr do
                         %a(href="#") Right 1
                       %li
                         %a(href="#") Right 2
+              .alert.alert-success(role="alert")=success_notice
+              .alert.alert-info(role="alert")=notice
+              .alert.alert-warning(role="alert")=alert_warning
+              .alert.alert-danger(role="alert")=alert
               = yield
       FILE_CONTENT
     File.delete Rails.root.join('app/assets/javascripts/application.js')
@@ -121,7 +166,7 @@ namespace :zwr do
         */
         @import "bootstrap-sprockets";
         @import "bootstrap";
-        @import "zwr"
+        @import "zwr";
       FILE_CONTENT
     File.write(Rails.root.join('db/seeds.rb'),<<-FILE_CONTENT.strip_heredoc)
       Dir[Rails.root.join('db/seeds/*.rb')].each { |file| load file }
@@ -165,4 +210,55 @@ namespace :zwr do
       `git push -uf origin production`
     end
   end
+  desc "creates user scaffod and devise object"
+  task :user do
+    #Rails::Generators.invoke("devise:install")
+    puts `rails g devise:install`
+    #Rails::Generators.invoke("scaffold",["User", "name:string","email:string",
+    #                                     "password:string","password_confirmation:string", 
+    #                                     "admin:boolean"])
+    puts `rails g scaffold User name:string email:string password:string password_confirmation:string admin:boolean`
+    puts "Removing app/models/user.rb"
+    File.delete Rails.root.join('app/models/user.rb')
+    puts "Renaming test/models/user_test.rb to test/models/user_test_orig.rb"
+    File.rename Rails.root.join('test/models/user_test.rb'), Rails.root.join('test/models/user_test_orig.rb')
+    puts "Removing test/factories/users.rb"
+    File.delete Rails.root.join('test/factories/users.rb')
+    #Rails::Generators.invoke("devise", ["User"])
+    puts `rails g devise User`
+    Rails.root.join("Gemfile").insert text: "gem 'bootstrap_form'"
+    Rails.root.join("app/assets/stylesheets/application.css.scss").insert text: '@import "rails_bootstrap_forms";'
+    Rails.root.join("app/models/user.rb").insert after: "field :encrypted_password" do |file|
+      file.puts '  field :name,               type: String, default: ""'
+      file.puts '  field :admin,              type: Boolean, default: ""'
+    end
+    Rails.root.join("app/views/layouts/application.html.haml").insert before: "= yield" do |file|
+      file.puts '      - if notice'
+      file.puts '        .alert.alert-info(role="alert")=notice'
+      file.puts '      - if alert'
+      file.puts '        .alert.alert-danger(role="alert")=alert'
+    end
+    Rails.root.join("app/views/users/_form.html.haml").insert text: "= bootstrap_form_for @user do |f|",
+                                                              instead_of: "form_for @user do"
+    Rails.root.join("app/views/users/_form.html.haml").insert text: "    #error_explanation.alert.alert-danger",
+                                                              instead_of: "error_explanation"
+    Rails.root.join("app/views/users/_form.html.haml").insert text: "    = f.password_field :password_confirmation",
+                                                              instead_of: "f.text_field :password_confirmation"
+    Rails.root.join("app/views/users/_form.html.haml").insert text: "    = f.password_field :password",
+                                                              instead_of: "f.text_field :password"
+    Rails.root.join("app/views/users/_form.html.haml").remove_line "f.label :name"
+    Rails.root.join("app/views/users/_form.html.haml").remove_line "f.label :email"
+    Rails.root.join("app/views/users/_form.html.haml").remove_line "f.label :password"
+    Rails.root.join("app/views/users/_form.html.haml").remove_line "f.label :password_confirmation"
+    Rails.root.join("app/views/users/_form.html.haml").remove_line "f.label :admin"
+    Rails.root.join("config/routes.rb").insert instead_of: "resources :users" do |file|
+      file.puts "  scope '/admin' do"
+      file.puts "    resources :users, as: 'users'"
+      file.puts "  end"
+    end
+    puts `bundle install`
+    puts `git add -A`
+    puts `git commit -sm "rake zwr:user"`
+    puts `prax restart`
+  end
 end

data/lib/zwr/railtie.rb

@@ -4,9 +4,9 @@ module Zwr
   class Railtie < Rails::Railtie
     railtie_name :zwr
 
-    rake_tasks do
-      Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
-    end
+    #rake_tasks do
+    #  Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+    #end
 
     # Following will allow us to use something like the following 
     # also in the javascript HAML templates:

data/zwr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'zwr'
-  s.version     = '0.1.1'
+  s.version     = '0.1.2'
   s.date        = '2014-10-26'
   s.summary     = "All the Zwr needs"
   s.description = "A gem in which I jam what I commonly use."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zwr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Zeljko
@@ -46,7 +46,7 @@ files:
 - app/assets/images/logo.png
 - app/assets/images/logo.xcf
 - app/assets/images/logo_transparent.png
-- app/assets/stylesheets/zwr.css.scss
+- app/assets/stylesheets/zwr.css.scss.erb
 - bin/zwr
 - lib/tasks/loc.rake
 - lib/tasks/zwr.rake