velcro-strap 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc283147fe816d5f5c2235c5a58741cd8c076882
-  data.tar.gz: e951b023756ca07ea250a89d8e9378533f899a16
+  metadata.gz: b2fcdddf76d72f34dc5f998013c9ad486e35149d
+  data.tar.gz: 92061745b13327e62d8ea62a18ce6c72c5e0d1cc
 SHA512:
-  metadata.gz: 1cc95707c7cf3d707dc9e73baa6a8f8044c081c87714e9c4aefeb9643a39ea1b017e2ccc12d25496aa20a2e41d0edb4fbb0c72010a43424be5f4c2253106b132
-  data.tar.gz: 009ab8342ff9308bcc6ab47a1fbd1ba7bff4751877c3acc09525a2f03195742bace2fae7bb2c692e8b545b33e7fde447addbe8118977a15c61350aaccb91470f
+  metadata.gz: 1a3b1abd2294d0804f129900adb1ad1313820c754a0b35ff65682866a232be2a78d2c17a1dc315d5ee2070d0e6304ecdd4d38ad1a7499d2cfd0a4383be7fc84b
+  data.tar.gz: 0df99cb9e346b4242ed31173199a274da1f0842ee9c9a2771ee4f3a43e3ce10099441c459930eda3e19b743fe2bfc8ff63caabe9fc62b23d4269c47b537ff0da

data/bin/velcro

@@ -7,13 +7,13 @@ module Velcro
   class Command < Thor
     option :dryrun,   type: :boolean, aliases: :n
     option :apps,     type: :boolean, aliases: :a
-    option :host,     type: :boolean, aliases: :o
     option :dotfiles, type: :boolean, aliases: :d
     option :symlinks, type: :boolean, aliases: :y
     option :scaffold, type: :boolean, aliases: :c
     option :settings, type: :boolean, aliases: :s
-    desc 'strap [REPO]', 'Setup a blank system with your dotfiles'
-    def strap(repo = nil)
+    desc 'strap [REPO] [HOST]', 'Setup a blank system with your dotfiles'
+    def strap(repo = nil, host = nil)
+      options[:host] = host unless host == nil
       Strap.new(repo, options).run
     rescue ArgumentError
       puts 'ERROR: "velcro strap" must be provided a repo url when cloning dotfiles'

data/lib/velcro/status/ruby.rb

@@ -18,8 +18,6 @@ module Velcro
         (`which rvm` =~ /not found/).nil?
       end
 
-      private
-
       def self.rubies
         `rvm list`.split("\n").select{|str| str =~ /ruby-/}
       end

data/lib/velcro/strap.rb

@@ -9,14 +9,18 @@ module Velcro
     include Velcro::Flags
     include Velcro::Shell
 
-    attr_reader :rcfile
+    attr_reader :rcfile, :host
 
-    FLAGS = %w(apps host dotfiles symlinks scaffold settings).freeze
+    FLAGS = %w(apps dotfiles symlinks scaffold settings).freeze
 
     def initialize(repo, options = {})
       establish_inclusions(FLAGS, options)
-      @dryrun = options[:dryrun] || false
+      if options.key?(:host)
+        @host = options[:host]
+        fail ArgumentError if host.nil? || host == ''
+      end
 
+      @dryrun = options[:dryrun] || false
       fail ArgumentError if repo.nil? && included?(:dotfiles)
       Velcro.config.repo_url = repo if repo
     end
@@ -31,7 +35,14 @@ module Velcro
       install_apps(rcfile['apps'])
       apply_settings(rcfile['settings'])
 
-      install_host if included?(:host)
+      if host
+        set_hostname unless host == Velcro.host
+
+        puts "\nSetting up #{host_data['name']}:"
+        install_scaffold(host_data)
+        install_apps(host_data['apps'])
+        apply_settings(host_data['settings'])
+      end
     end
     # rubocop:enable Metrics/AbcSize
 
@@ -58,13 +69,9 @@ module Velcro
       scaffolder.install(config)
     end
 
-    def install_host
-      return unless host
-
-      puts "\nSetting up #{host['name']}:"
-      install_scaffold(host)
-      install_apps(host['apps'])
-      apply_settings(host['settings'])
+    def set_hostname
+      shell("sudo scutil --set LocalHostName #{host}")
+      shell("sudo scutil --set ComputerName #{host}")
     end
 
     def install_dotfiles
@@ -104,12 +111,12 @@ module Velcro
       @scaffolder ||= Scaffold.new(dryrun: dryrun)
     end
 
-    def host
-      return @host if defined?(@host)
-      @host = rcfile['hosts'].detect{|n| n['name'] == Velcro.hostname }
-      puts "No host settings found for: #{Velcro.hostname}" if host.nil?
+    def host_data
+      return @host_data if defined?(@host_data)
+      @host_data = rcfile['hosts'].detect{|n| n['name'] == Velcro.hostname }
+      puts "No host settings found for: #{Velcro.hostname}" if host_data.nil?
 
-      @host
+      @host_data
     end
   end
 end

data/lib/velcro/version.rb

@@ -1,4 +1,4 @@
 # Velcro version
 module Velcro
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: velcro-strap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Matthew Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor