myosx 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b15858a0a89d514f175d4ef2765547599faf5f5d
-  data.tar.gz: f7bb5f54c355738b3f3ce778209e593cd7992f8c
+  metadata.gz: 5452e9a2e38902cd1a893f6ede7202e367bf2baf
+  data.tar.gz: 725ffe4995b8f4e21a0295bfaff50865214febd4
 SHA512:
-  metadata.gz: a88fe489da16a3cc974241f46e7a91777d26b8a5da20b4cd7ad71e71bd9c58453e9352670b7a93751dd2dec066b5fe79449f70d2a4beffdf920c05cdd4ffa64a
-  data.tar.gz: 91fb8d1ec15874bad0aa905d4c34f97a8458d97ecc4d036e4901a2398c95b453804e154eb1111a9ed41eda4137d39460f7bae4e77e82ee62f0181f2e1c3b2b8a
+  metadata.gz: 0a2c76eece56bdfe1418e2f5afd498026bdc440593f57866d68df9ba9858c1a0c1e5be155bfa0d4ea4bdc2c5082ffc2d09380ccf3f1443744947e4b54e9361fd
+  data.tar.gz: c6a8f2ce2c54427a85fe2cb76d86fb047e837821ea2787af45a2ef9cd69b21ec3b6ad970b8adbd5b8c86ba50c65712ae6537c88408e6f858ab7ba69a75a48d2a

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+spec/stub/dotfiles/

data/README.md

@@ -1,6 +1,9 @@
-# Myosx
+[![Build Status](https://travis-ci.org/surminus/myosx.svg?branch=master)](https://travis-ci.org/surminus/myosx)
+
+# MyOSX
+
+MyOSX configures OSX how I like it
 
-myosx configures osx how I like it.
 
 ## Setup
 
@@ -28,7 +31,7 @@ Use the example config file to set some things (`example.myosx.cnf`)
 `MYOSX_WORKSPACE`
 
 This is where everything is stored such as Brewfiles and any other repositories
-that it may pull. Default is '~/.myosx'
+that it may pull. Default is `~/.myosx`
 
 
 ## Contributing

data/lib/myosx/config.rb

@@ -5,23 +5,22 @@ require 'yaml'
 require 'git'
 
 class Config
-  def initialize
-    config_location = ENV['MYOSX_CONFIG'] || '~/.myosx.cnf'
-    config_file = File.expand_path(config_location)
-    raise "Cannot find config file: #{config_file}" unless File.exist?(config_file)
-    $global_config = YAML.load_file(config_file)
-    $workspace = workspace_directory
+  def config_file
+    ENV["MYOSX_CONFIG"] || File.expand_path('~/.myosx.cnf')
+  end
+
+  def global
+    YAML.load_file(config_file)
   end
 
   def workspace_directory
-    workspace_dir_name = ENV['MYOSX_WORKSPACE'] || '~/.myosx/'
-    return File.expand_path(workspace_dir_name)
+    ENV['MYOSX_WORKSPACE'] || File.expand_path('~/.myosx/')
   end
 
-  def create_workspace
-    unless Dir.exists?($workspace)
-      puts "Creating workspace: #{workspace_directory}"
-      Dir.mkdir("#{workspace_directory}", 0750)
+  def create_workspace(directory)
+    unless Dir.exists?(directory)
+      puts "Creating workspace: #{directory}"
+      Dir.mkdir("#{directory}", 0750)
     end
   end
 end

data/lib/myosx/dotfiles.rb

@@ -8,20 +8,20 @@ require_relative 'config'
 
 class Dotfiles < Config
   def config
-    $global_config['dotfiles']
+    Config.new.global['dotfiles']
   end
 
   def dotfiledir
-    File.join($workspace, 'dotfiles')
+    File.join(Config.new.workspace_directory, 'dotfiles')
   end
 
-  def repo(repo)
+  def repo(repo, target, local_repo = 'dotfiles')
     if Git.ls_remote(repo)
-      unless File.exist?(dotfiledir)
-        puts "Cloning #{dotfile_repo}"
-        Git.clone(repo, 'dotfiles', :path => $workspace)
+      unless File.exist?(target)
+        puts "Cloning #{repo}"
+        Git.clone(repo, local_repo, :path => File.dirname(target))
       else
-        g = Git.init(dotfiledir)
+        g = Git.init(target)
         puts "Pulling latest #{repo}"
         g.pull
       end
@@ -29,23 +29,27 @@ class Dotfiles < Config
   end
 
   def link(file, dest)
-    source_file = "#{dotfiledir}/#{file}"
-
     dest = File.expand_path(dest)
-    raise "#{source_file} doesn't exist! Check your config or repo" unless File.exist?(source_file)
+    raise "#{file} doesn't exist! Check your config or repo" unless File.exist?(file)
 
     if File.exist?(dest)
+      backup_file = "#{dest}.#{Date.today.to_s}"
+      puts "Creating backup of #{dest} called: #{backup_file}"
+      File.rename(dest, backup_file)
+    end
+
+    if File.symlink?(dest)
       File.delete(dest)
     end
 
-    puts "Linking #{source_file} to #{dest}"
-    File.symlink(source_file, dest)
+    puts "Linking #{file} to #{dest}"
+    File.symlink(file, dest)
   end
 
   def exec
-    if repo(config['repo'])
-      config['files'].each do |k, v|
-        link(k, v)
+    if repo(config['repo'], dotfiledir)
+      config['files'].each do |file, dest|
+        link("#{dotfiledir}/#{file}", dest)
       end
     end
   end

data/lib/myosx/homebrew.rb

@@ -9,7 +9,7 @@ require_relative 'config'
 class Homebrew < Config
 
   def config
-    $global_config['homebrew']
+    Config.new.global['homebrew']
   end
 
   def packages
@@ -17,7 +17,7 @@ class Homebrew < Config
   end
 
   def brewfile
-    return File.join($workspace, 'Brewfile')
+    return File.join(Config.new.workspace_directory, 'Brewfile')
   end
 
   def brewfile_out(packages)

data/lib/myosx/rbenv.rb

@@ -9,7 +9,7 @@ require_relative 'config'
 
 class Rbenv < Config
   def config
-    $global_config['rbenv']
+    Config.new.global['rbenv']
   end
 
   def install

data/lib/myosx/version.rb

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

data/lib/myosx.rb

@@ -7,17 +7,17 @@ require "myosx/rbenv"
 module Myosx
   class Exec < Config
     def initialize
-      Config.new.create_workspace
+      Config.new.create_workspace(Config.new.workspace_directory)
 
-      if $global_config['dotfiles']
+      if Config.new.global['dotfiles']
         Dotfiles.new.exec
       end
 
-      if $global_config['homebrew']
+      if Config.new.global['homebrew']
         Homebrew.new.exec
       end
 
-      if $global_config['rbenv']
+      if Config.new.global['rbenv']
         Rbenv.new.exec
       end
     end

data/myosx.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["surminus@gmail.com"]
 
   spec.summary       = %q{myosx configures OSX how I like it}
-  spec.homepage      = "https://github.com/surminus/myosx."
+  spec.homepage      = "https://github.com/surminus/myosx"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myosx
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Laura Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -95,7 +95,7 @@ files:
 - lib/myosx/shell.rb
 - lib/myosx/version.rb
 - myosx.gemspec
-homepage: https://github.com/surminus/myosx.
+homepage: https://github.com/surminus/myosx
 licenses:
 - MIT
 metadata: {}