zsh_dots 0.5.9 → 0.6.0

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

@@ -62,9 +62,6 @@ alias gts='git reset --soft'
 compdef _get gt=git-reset
 alias gthh='git reset --hard HEAD'
 compdef _get gt=git-reset
-alias garc='ga . && grc'
-compdef _get garc=git-add
-compdef _get garc=git-rebase
 
 # Stash
 alias gs='git stash save'
@@ -87,6 +84,9 @@ alias gmt='git mergetool'
 compdef _get gmt=git-mergetool
 alias gcf='git clean -f'
 compdef _get gcf=git-clean
+alias garc='gcf && ga . && grc' # a big one..., clean the repo, add everything, rebase --continue
+compdef _get garc=git-add
+compdef _get garc=git-rebase
 
 # Super useful alias aliases
 alias s='gst'

data/lib/plugins/heroku/heroku.plugin.zsh

@@ -0,0 +1,12 @@
+# Heroku plugin
+#
+# A tool for managing continuous deployment from Travis to Heroku.
+
+# Load Heroku config
+source ~/.dots/config/heroku.zsh
+
+# Secure your API key on Travis, so it can be uploaded to CI and
+# used to deploy your Heroku app.
+function secure_api_key() {
+  travis encrypt $1 HEROKU_API_KEY=$HEROKU_API_KEY
+}

data/lib/ruby/dots/bootstrap.rb

@@ -1,36 +1,34 @@
+require 'dots/packages'
+
 module Dots
   module Bootstrap
     include Thor::Actions
 
-    # These are the programs we are going to download from Homebrew.
-    PROGRAMS = %w(git ruby python vim pip hub)
-    PACKAGES = %w(httpie aws)
-
     # Install C binaries, Python programs, and other useful tools
-    # from Homebrew.
+    # from Homebrew. Install Homebrew if it isn't already installed,
+    # then recursively call this method to install packages.
     def install_programs
       if installed? "brew"
-        programs_to_install = PROGRAMS.reduce([]) { |programs, program|
-          programs << program unless installed? program
-        }.join " "
-
-        system "brew install #{programs_to_install}" \
-          unless programs_to_install.empty?
-        install_packages
+        install_packages and install_configuration
+      elsif @homebrew.present? # make sure we're not in an infinite loop
+        puts "WARNING: Homebrew can not install. Exiting.." and exit(1)
       else
+        @homebrew = true # used when the if statement fails twice
         install_homebrew and install_programs
       end
     end
 
-    # Install the latest version of all gems to the global gemset. These
-    # gems are configured in +~/.Gemfile+.
-    def install_bundle
-      system "cd && #{install_bundler} && #{install_global_gemset}"
+    # When Homebrew is installed, use it to install Python and Ruby, then
+    # install necessary packages for Python and Ruby.
+    def install_packages
+      %w(system python ruby).each { |l| send "install_#{l}_packages" }
     end
 
-    # Install Python packages from pip. Pip!
-    def install_packages
-      system "pip install #{PACKAGES.join(' ')}"
+    # Install configuration file templates that for one reason or another
+    # we can't include in the repo directly. Usually due to exposed passwords
+    # or API keys.
+    def install_configuration
+      system "mkdir -p ~/.irssi && cp -R ~/.dots/etc/irssi/** ~/.irssi"
     end
 
   private
@@ -38,17 +36,39 @@ module Dots
       `which #{command}` != ""
     end
 
-    def install_bundler
-      "gem install bundler"
+    def installed_and_not_ruby? command
+      installed?(command) && command != 'ruby'
     end
 
-    def install_global_gemset
-      "gem install #{Dots.gems}"
-    end
-
-    # Install the latest version of the Homebrew package manager.
     def install_homebrew
       %x[ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"]
     end
+
+    def install_system_packages
+      programs_to_install = system_packages.reduce([]) { |programs, program|
+        programs << program unless installed_and_not_ruby? program
+      }.join " "
+
+      system "brew install #{programs_to_install}" \
+        unless programs_to_install.empty?
+    end
+
+    def install_ruby_packages
+      "gem install #{ruby_packages}"
+    end
+
+    def install_python_packages
+      system "pip install #{python_packages}"
+    end
+
+    %w(system python ruby).each do |language|
+      define_method "#{language}_packages" do
+        packages.for language
+      end
+    end
+
+    def packages
+      @packages ||= Packages.new
+    end
   end
 end

data/lib/ruby/dots/packages.rb

@@ -0,0 +1,19 @@
+require 'yaml'
+
+module Dots
+  # Represents the config/packages.yml file.
+  class Packages
+    def initialize
+      @config = YAML::load_file from_yaml_file_path
+    end
+
+    def for language
+      @config[language]
+    end
+
+  private
+    def from_yaml_file_path
+      File.expand_path("~/.dots/config/packages.yml")
+    end
+  end
+end

data/lib/ruby/dots/version.rb

@@ -1,3 +1,3 @@
 module Dots
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

metadata

@@ -2,14 +2,14 @@
 name: zsh_dots
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Tom Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -82,6 +82,7 @@ files:
 - config/gemrc
 - config/gitconfig
 - config/gitignore
+- config/heroku.zsh.example
 - config/muttrc.example
 - config/osx.zsh
 - config/railsrc
@@ -91,6 +92,16 @@ files:
 - config/vimrc
 - config/zshenv
 - config/zshrc
+- etc/irssi/config
+- etc/irssi/config.example
+- etc/irssi/default.theme
+- etc/irssi/nickserv.networks
+- etc/irssi/scripts/autorun/freenode_filter.pl
+- etc/irssi/scripts/autorun/nickserv.pl
+- etc/irssi/scripts/autorun/trigger.pl
+- etc/irssi/scripts/autorun/vim_mode.pl
+- etc/irssi/solarized-universal.theme
+- etc/irssi/triggers
 - etc/mandlebrot.c
 - etc/rails/composer.yml
 - etc/rails/ember_template.rb
@@ -110,6 +121,7 @@ files:
 - lib/plugins/git-flow/git-flow.plugin.zsh
 - lib/plugins/git-process/git-process.plugin.zsh
 - lib/plugins/git/git.plugin.zsh
+- lib/plugins/heroku/heroku.plugin.zsh
 - lib/plugins/knife/_knife
 - lib/plugins/knife/knife.plugin.zsh
 - lib/plugins/macvim/macvim.plugin.zsh
@@ -124,6 +136,7 @@ files:
 - lib/ruby/dots/dot_file.rb
 - lib/ruby/dots/installation.rb
 - lib/ruby/dots/installer.rb
+- lib/ruby/dots/packages.rb
 - lib/ruby/dots/persistence.rb
 - lib/ruby/dots/sanity.rb
 - lib/ruby/dots/version.rb
@@ -152,16 +165,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -2237897093631442027
+      hash: -4117296198963250433
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -2237897093631442027
       version: '0'
 requirements: []
 rubyforge_project: