zsh_dots 0.6.3 → 0.6.5

data/Rakefile

@@ -1,16 +1,8 @@
 #!/usr/bin/env rake
-#
-# This is for Rake tasks that pertain to the development and
-# maintainence of DOTS itself. All tasks that can be loaded
-# with `rake -g` should be put into a .rake file in ~/.dots/lib/tasks.
-#
-# These tasks are also available within DOTS natively.
 
 require 'rake'
 require 'bundler/gem_tasks'
 
-Dir["lib/tasks/*.rake"].each { |rake_file| load rake_file }
-
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:test)
@@ -18,9 +10,4 @@ rescue LoadError => e
   # RSpec can not be run in the gem installation.
 end
 
-desc "Update DOTS, Antigen, and all installed plugins."
-task :update do
-  sh "cd ~/.dots && git pull origin master"
-  sh "cd ~/.dots && git submodule sync"
-  sh "antigen-update"
-end
+Dir["lib/tasks/*.rake"].each { |rake_file| load rake_file }

data/config/gitconfig

@@ -12,24 +12,25 @@
 	br = branch
   co = checkout
   blog = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset' --decorate
-  l = !git blog
-  unstage = reset HEAD
   staged = diff --cached
   unstaged = diff
   current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
   track = checkout -t
   restore = stash pop
-  # Rewrite of 'git-process' in git. Basically the same thing without
-  # the _parking_ branch (it's the same as master)
-  sync = !git fetch origin && git rebase master
-  new-fb = !git checkout master && git pull --rebase origin master && git checkout -b $2
+  # git_ship: Rewrite of 'git-process' in git. Basically the same thing without the _parking_ branch (it's the same as master)
+  blog = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset' --abbrev-commit --decorate
+  unstage = reset HEAD
+  restore = stash pop
+  sync = !export GIT_BRANCH=`git current-branch` && git fetch origin && git checkout master && git rebase origin/master && git checkout $GIT_BRANCH && git rebase master
+  feature = !git checkout master && git pull --rebase origin master && git checkout -b $2
+  new-fb = !git feature
   expose = !git sync && git push origin `git current-branch`
-  pull-upstream = !git pull --rebase origin master && git checkout master
-  to-master = !export GIT_BRANCH=`git current-branch` && git pull-upstream  && git merge $GIT_BRANCH && git push origin master && git branch -D $GIT_BRANCH
-  ship = !git to-master
+  swim = !git pull --rebase origin master && git checkout master
+  ship = !export GIT_BRANCH=`git current-branch` && git swim && git merge $GIT_BRANCH && git push origin master && git branch -D $GIT_BRANCH
+  prepare = rebase --interactive origin/master
+  # Makes your life generally easier..
   rename-branch = !export GIT_BRANCH=`git current-branch` && git checkout master && git branch -m $GIT_BRANCH $1
   delete-branch = !export GIT_BRANCH=`git current-branch` && git checkout master && git branch -D $GIT_BRANCH
-  prepare = rebase --interactive origin/master
 [apply]
   whitespace = warn
 [color]

data/config/railsrc

@@ -1,2 +1 @@
---skip-bundle -m ~/etc/rails/template.rb --database=postgresql
-
+--skip-bundle --database=postgresql --builder=~/etc/rails/builder.rb --template=~/etc/rails/template.rb

data/config/zshenv

@@ -8,7 +8,8 @@ ZSH=$HOME/.dots
 DOTS=$ZSH
 
 # Domain-specific PATHs.
-RBPATH=/usr/local/lib/ruby/gems/1.9.1/bin:/usr/local/Cellar/ruby/1.9.3-p362/bin
+RUBY_VERSION='1.9.3-p385'
+RBPATH=/usr/local/lib/ruby/gems/1.9.1/bin:/usr/local/Cellar/ruby/$RUBY_VERSION/bin
 JSPATH=node_modules/.bin:/usr/local/share/npm/bin
 PYPATH=/usr/local/Cellar/python/2.7.3/bin:/usr/local/share/python
 GOPATH=$HOME/Code/Go

data/etc/rails/builder.rb

@@ -0,0 +1,87 @@
+# Some modern modifications to the standard Rails application builder.
+class ModernBuilder < Rails::AppBuilder
+  attr_accessor :devise_requested
+
+  # Use Markdown instead of RDoc
+  def readme
+    create_file "README.md", "# #{app_name.titleize}"
+  end
+
+  # Use RSpec instead of Minitest
+  def test
+    run 'bundle install'
+    generate 'rspec:install'
+  end
+
+  # Use Haml, Foreman, Draper and ActiveModelSerializers as well
+  # as other helpful testing gems.
+  def gemfile
+    super
+    self.devise_requested = ask? "Would you like to install Devise?"
+    @generator.gem 'devise' if devise_requested
+    @generator.gem 'haml'
+    @generator.gem 'foreman'
+    @generator.gem 'draper'
+    @generator.gem 'active_model_serializers'
+
+    @generator.gem_group :development do
+      @generator.gem 'haml-rails'
+      @generator.gem 'ruby_parser'
+      @generator.gem 'hpricot'
+      @generator.gem 'puma'
+    end
+
+    @generator.gem_group :test do
+      @generator.gem 'rspec-rails'
+      @generator.gem 'capybara'
+    end
+  end
+
+  # Set up the Travis-CI, Shell and generator configuration
+  def leftovers
+    copy_configuration
+    initialize_generators
+    install_devise if devise_requested
+    remove_garbage
+    create_repository
+  end
+
+private
+  def copy_configuration
+    %w(.env .travis.yml Procfile).each do |name|
+      file(name) { IO.read File.expand_path("~/etc/rails/template/#{name}") }
+    end
+  end
+
+  def initialize_generators
+    initializer "generators.rb", <<-RUBY
+    Rails.application.config.generators do |g|
+      g.template_engine :haml
+      g.test_framework :rspec, fixtures: true, fixture_location: "spec/fixtures"
+    end
+    RUBY
+  end
+
+  def install_devise
+    generate 'devise:install'
+    append_file 'config/application.rb', <<-RUBY
+    Rails.application.config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+    RUBY
+    generate 'devise user'
+  end
+
+  def remove_garbage
+    run "rm -rf public/index.html"
+  end
+
+  def set_up_database
+    run "createuser -s #{app_name}"
+    rake 'db:create'
+    rake 'db:test:prepare'
+  end
+
+  def create_repository
+    git :init
+    git add: '.', commit: "-m 'Initial commit'"
+  end
+end

data/etc/rails/template/Procfile

@@ -0,0 +1 @@
+web: bundle exec rails server puma

data/etc/rails/template/bundle-config

@@ -0,0 +1,3 @@
+---
+BUNDLE_DISABLE_SHARED_GEMS: '0'
+BUNDLE_BIN: 'bin/'

data/etc/rails/template/env

@@ -0,0 +1,2 @@
+export GEM_HOME=vendor/gems
+export PATH=$PWD/bin:$PATH

data/lib/plugins/git/git.plugin.zsh

@@ -9,7 +9,9 @@ alias gur='git pull --rebase'
 compdef _git gl=git-pull
 alias gp='git push'
 compdef _git gp=git-push
-alias gpf='git push tubbo'
+alias gpf="git push `git config github.user`"
+compdef _git gpf=git-push
+alias gph="git push heroku"
 compdef _git gpf=git-push
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff

data/lib/ruby/dots/installation.rb

@@ -11,7 +11,7 @@ module Dots
 
     # The Git remote we'll be pulling from. Set this in your +~/.zshenv+
     # to use a different fork of the project.
-    REMOTE = ENV['DOTS_REMOTE'] or 'origin'
+    REMOTE = ENV['DOTS_REMOTE'] || "origin"
 
     # Attempts to update DOTS, but fails if changes are detected
     # in the repo beforehand.

data/lib/ruby/dots/version.rb

@@ -1,3 +1,3 @@
 module Dots
-  VERSION = "0.6.3"
+  VERSION = "0.6.5"
 end

data/lib/tasks/antigen.rake

@@ -0,0 +1,5 @@
+desc "Update vendored Antigen from Git"
+task :antigen do
+  sh "git submodule sync"
+  sh "git submodule foreach 'git pull origin master'"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zsh_dots
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   VXZIRWlMV3BGOTVnejlId0tFRmVmZkVwNWR1bFRKSXYxYk0rTTRkVC8wcXRQ
   a09iS1l3VgpmL2ppSG92UXJMWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0t
   LQo=
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -130,14 +130,17 @@ files:
 - etc/irssi/solarized-universal.theme
 - etc/irssi/triggers
 - etc/mandlebrot.c
+- etc/rails/builder.rb
 - etc/rails/composer.yml
 - etc/rails/ember_template.rb
 - etc/rails/recipes/haml_views.rb
 - etc/rails/recipes/html5.rb
 - etc/rails/recipes/readme_markdown.rb
 - etc/rails/template.rb
-- etc/rails/template/.env
-- etc/rails/template/.travis.yml
+- etc/rails/template/Procfile
+- etc/rails/template/bundle-config
+- etc/rails/template/env
+- etc/rails/template/travis.yml
 - gem-public_cert.pem
 - lib/dots.sh
 - lib/dots/aliases.zsh
@@ -170,6 +173,7 @@ files:
 - lib/ruby/dots/version.rb
 - lib/ruby/templates/usage.txt.erb
 - lib/tasks/.gitkeep
+- lib/tasks/antigen.rake
 - script/stock
 - spec/integration/command_spec.rb
 - spec/models/dot_file_spec.rb

data/etc/rails/template/.env

@@ -1,2 +0,0 @@
-export GEM_HOME=vendor/gems
-export PATH=vendor/gems/bin:$PATH