myosx 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b683d094400d8a71ae23a9e64277b52fade91563
-  data.tar.gz: c6508f9235f2b7c2733c346d3f0f6161cb21244a
+  metadata.gz: b15858a0a89d514f175d4ef2765547599faf5f5d
+  data.tar.gz: f7bb5f54c355738b3f3ce778209e593cd7992f8c
 SHA512:
-  metadata.gz: e5f70a479bea93bc273b9d1f815224992dd46cb980d2c0da7f8541f48566f06a3fdd1470617fc3422ba369a415f8d9c1feb54f75350c4d3235391b1650b92cdd
-  data.tar.gz: b9e9daddc1fea60000ec4b91cdcc939304dfabfa043d6c8ee13e519c99dd1800c19b57bbaeafddf80bfb9e376a4e6f5f75654df2656c5e8d7bf477ddcd6001af
+  metadata.gz: a88fe489da16a3cc974241f46e7a91777d26b8a5da20b4cd7ad71e71bd9c58453e9352670b7a93751dd2dec066b5fe79449f70d2a4beffdf920c05cdd4ffa64a
+  data.tar.gz: 91fb8d1ec15874bad0aa905d4c34f97a8458d97ecc4d036e4901a2398c95b453804e154eb1111a9ed41eda4137d39460f7bae4e77e82ee62f0181f2e1c3b2b8a

data/.travis.yml

@@ -2,4 +2,9 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.3
-before_install: gem install bundler -v 1.13.6
+before_install:
+  - gem install bundler -v 1.13.6
+env:
+  - export MYOSX_CONFIG=${TRAVIS_BUILD_DIR}/spec/example.config.yaml
+os:
+  - osx

data/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'git'
-gem 'rake'
-gem 'rspec'
+
+group :test do
+  gem "rake"
+  gem "rspec"
+end

data/README.md

@@ -6,19 +6,17 @@ myosx configures osx how I like it.
 
 1. Install XCode
 2. [Install homebrew](http://brew.sh/)
-3. `bundle install`
+3. `gem install myosx`
+4. Create a [config file](https://github.com/surminus/myosx/blob/master/example.myosx.cnf) in `~/.myosx.cnf`
+5. `$ myosx`
 
-## Usage
-
-Notes on how to test before it's a gem. Clone repo and from inside:
-
-`RUBYLIB=$(pwd)/lib bin/myosx`
 
 ## Config
 
 You can set two key configs from environment variables:
 
 ### Config file
+
 `MYOSX_CONFIG`
 
 If this isn't set then it defaults to `~/.myosx.cnf`
@@ -26,10 +24,11 @@ If this isn't set then it defaults to `~/.myosx.cnf`
 Use the example config file to set some things (`example.myosx.cnf`)
 
 ### Workspace directory
+
 `MYOSX_WORKSPACE`
 
 This is where everything is stored such as Brewfiles and any other repositories
-that it may pull.
+that it may pull. Default is '~/.myosx'
 
 
 ## Contributing

data/bin/myosx

@@ -2,5 +2,5 @@
 
 require "myosx"
 
-Myosx::Bootstrap.new
+Myosx::Exec.new
 

data/example.myosx.cnf

@@ -1,7 +1,6 @@
 ---
 # Manage your dotfiles
 dotfiles:
-  manage: true
   repo: 'https://github.com/surminus/dotfiles.git'
   files:
     ackrc: '~/.ackrc'
@@ -11,7 +10,6 @@ dotfiles:
 
 # Manage homebrew packages
 homebrew:
-  manage: true
   packages:
     brew:
       - 'ack'
@@ -84,7 +82,6 @@ homebrew:
       - 'caskroom/cask'
 
 rbenv:
-  manage: true
   versions:
     - '1.9.3'
     - '1.9.3-p550'

data/lib/myosx/dotfiles.rb

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
-
+#
+# Pulls a dotfiles repo and symlinks the files where you specify
+#
 require 'yaml'
 require 'git'
 require_relative 'config'
 
 class Dotfiles < Config
-  def initialize
-    @config = $global_config['dotfiles']
+  def config
+    $global_config['dotfiles']
   end
 
   def dotfiledir
@@ -41,11 +43,9 @@ class Dotfiles < Config
   end
 
   def exec
-    if @config['manage']
-      if repo(@config['repo'])
-        @config['files'].each do |k, v|
-          link(k, v)
-        end
+    if repo(config['repo'])
+      config['files'].each do |k, v|
+        link(k, v)
       end
     end
   end

data/lib/myosx/homebrew.rb

@@ -7,32 +7,42 @@ require 'git'
 require_relative 'config'
 
 class Homebrew < Config
-  def initialize
-    @config = $global_config['homebrew']
+
+  def config
+    $global_config['homebrew']
+  end
+
+  def packages
+    config['packages']
+  end
+
+  def brewfile
+    return File.join($workspace, 'Brewfile')
+  end
+
+  def brewfile_out(packages)
+    output = ''
+    packages.each do |type, package_array|
+      package_array.each do |package|
+        output << "#{type} '#{package}'\n"
+      end
+    end
+    return output
   end
 
   def bundle
     system("brew tap Homebrew/bundle")
     puts "Updating Brewfile"
-    packages = @config['packages']
-    brew_packages = packages['brew']
-    tap_packages = packages['tap']
-    cask_packages = packages['cask']
-
-    File.open(File.join($workspace, 'Brewfile'), "w+") do |f|
-      brew_packages.each { |p| f.puts "brew '#{p}'" }
-      tap_packages.each { |p| f.puts "tap '#{p}'" }
-      cask_packages.each { |p| f.puts "cask '#{p}'" }
-    end
-    brewfile = File.join($workspace, 'Brewfile')
+
+    File.open(brewfile, "w+") {
+      |file| file.write(brewfile_out(packages))
+    }
 
     puts "Installing packages from #{brewfile}"
-    system("brew bundle --file=#{brewfile}")
+    system("brew", "bundle", "--file=#{brewfile}")
   end
 
   def exec
-    if @config['manage']
-      bundle
-    end
+    bundle
   end
 end

data/lib/myosx/rbenv.rb

@@ -8,8 +8,8 @@ require 'yaml'
 require_relative 'config'
 
 class Rbenv < Config
-  def initialize
-    @config = $global_config['rbenv']
+  def config
+    $global_config['rbenv']
   end
 
   def install
@@ -21,7 +21,7 @@ class Rbenv < Config
       end
     end
 
-    versions = @config['versions']
+    versions = config['versions']
     puts "Checking Ruby version:"
     versions.each do |version|
       puts "  #{version}"
@@ -30,8 +30,6 @@ class Rbenv < Config
   end
 
   def exec
-    if @config['manage']
-      install
-    end
+    install
   end
 end

data/lib/myosx/version.rb

@@ -1,3 +1,3 @@
 module Myosx
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/myosx.rb

@@ -5,12 +5,21 @@ require "myosx/homebrew"
 require "myosx/rbenv"
 
 module Myosx
-  class Bootstrap
+  class Exec < Config
     def initialize
       Config.new.create_workspace
-      Dotfiles.new.exec
-      Homebrew.new.exec
-      Rbenv.new.exec
+
+      if $global_config['dotfiles']
+        Dotfiles.new.exec
+      end
+
+      if $global_config['homebrew']
+        Homebrew.new.exec
+      end
+
+      if $global_config['rbenv']
+        Rbenv.new.exec
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myosx
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Laura Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git