opskit 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9209f0b04c7c210ce8cc00d6522293c42ac18988
-  data.tar.gz: e884c18f2456ffc6701be54b85ebf16b8ffe168c
+  metadata.gz: d89b64c75f4eddaf021b4e895360a1734d59a49c
+  data.tar.gz: e5c635f6b09595fde80f58555803feaf3a6b96a9
 SHA512:
-  metadata.gz: 834dc05dfd7bfe5365b2ac5de1113575a3d7a2320bbfe89948b5f3603e4c76610656412995b2ab35a50e2957c52d4c8c183f76651f355bcae256faba05cbe058
-  data.tar.gz: d6d61b96af46e6bd4030536950445136a558eafc5255fcd22c8c6231fb0e1aa8fb8b1e1dc20b3ca16413c60d2f8fbf8aa9175caabd21b00cc11c52ba86ac2312
+  metadata.gz: 36ad979ad1dd415917edcdf427c30bbc465c5bd1bf246cfed1dc28831cb439c0fda2dc6f94bedcade1f9968d137ee6fadb0c6da5453b7fa80a6764f6c3ec3f29
+  data.tar.gz: b8905f380e197cff419dd7c43213c01217c7354b2402af24c745a28a11867ba0173c919e4d5c42625d6f175ffbce209332ff626c1f0bddc895249533a109ea6f

data/lib/opskit.rb

@@ -4,5 +4,17 @@ require "opskit/version"
 require "opskit/cli"
 require "opskit/vhost"
 require "opskit/host"
+require "opskit/configuration"
+require 'thor/actions'
 
-module OpsKit;end
+module OpsKit
+
+	class << self
+		attr_accessor :configuration
+	end
+
+  def self.configure name
+    self.configuration ||= Configuration.new(name)
+    #yield(configuration) #Not sure if we need somthing like initializers
+  end
+end

data/lib/opskit/cli.rb

@@ -1,27 +1,101 @@
 require 'thor'
 require 'thor/actions'
 require 'yaml'
+require 'fileutils'
 
 module OpsKit
   class OdinSon < Thor
     include Thor::Actions
 
-    desc "export", "Generates vhost and host file config"
-    def export
-      conf = {}
-      conf[:url] = ask "What is the dev url?"
-      conf[:docroot] = ask "What is the docroot?"
+    desc "setup", "Setup a project based on a git repo"
+    def setup (repo, name=nil)
+      if !name
+        name = repo.split('/').last.split(".git").first
+      end
+
+      OpsKit.configure name
+
+      if Dir.exist? OpsKit.configuration.project_root
+        return if no? "This project already exists do you want to overwrite it?"
+        clean name
+      end
+
+      say "Cloning repo into #{OpsKit.configuration.project_root}", :cyan
+      run "git clone #{repo} #{name}"
+
+      if yes? "create vhost?"
+        ask_for_url
+        ask_for_docroot
+
+        vhost = OpsKit::VHost.new( {template: OpsKit.configuration.template, url: OpsKit.configuration.url, docroot: OpsKit.configuration.docroot } )
+        say "Create vhost for #{vhost.conf[:url]} at #{vhost.vhost_location}", :cyan
+        run "echo '#{vhost.render}' | sudo tee #{vhost.vhost_location}"
+        run "sudo a2ensite #{vhost.conf[:url]}"
 
-      if yes?("Is it a custom template? y/n")
-        conf[:template_path] = ask "What is the template path?"
+        say "Creating hosts entry", :cyan
+        run "grep -q -F '127.0.0.1 #{vhost.conf[:url]}' /etc/hosts || echo '127.0.0.1 #{vhost.conf[:url]}' | sudo tee -a /etc/hosts"
+
+        say "Reload the apache2 server", :cyan
+        run "sudo service apache2 reload"
+      end
+
+    end
+
+    desc "clean", "Cleans a project from your system"
+    def clean (name)
+      OpsKit.configure name
+
+      if Dir.exist? OpsKit.configuration.project_root
+        return if no? "This will remove #{OpsKit.configuration.project_root} are you sure?"
+        FileUtils.rm_rf(OpsKit.configuration.project_root)
       else
-        conf[:template] = ask "What is the template?"
+        return if no? "Can´t find the project continue cleaning?"
+      end
+
+      if yes? "clean vhost?"
+
+        ask_for_url
+        vhost = OpsKit::VHost.new( {template: OpsKit.configuration.template, url: OpsKit.configuration.url, docroot: OpsKit.configuration.docroot } )
+
+        say "Removing the hosts entry for #{vhost.conf[:url]}", :cyan
+        run "sed '/127.0.0.1 #{vhost.conf[:url]}/d' /etc/hosts | sudo tee /etc/hosts"
+
+        say "Disabling #{vhost.conf[:url]}", :cyan
+        run "sudo a2dissite #{vhost.conf[:url]}"
+
+        say "Remove #{vhost.vhost_location}", :cyan
+        if File.exist? vhost.vhost_location
+          run "sudo rm #{vhost.vhost_location}"
+        else
+          say "Couldn't find #{vhost.vhost_location}", :red
+        end
+
+        say "Reload the apache2 server", :cyan
+        run "sudo service apache2 reload"
+      end
+    end
+
+    no_commands do
+      def ask_for_url
+        url = ask "What is the dev url? [#{OpsKit.configuration.url}]"
+
+        return if url == ""
+
+        OpsKit.configuration.url = url
       end
 
-      vhost = OpsKit::VHost.new( conf )
+      def ask_for_docroot
+        path = ask "What is the docroot? [#{OpsKit.configuration.docroot}]"
 
-      system "echo '#{vhost.render}' | sudo tee #{ vhost.vhost_location }"
-      system "echo '127.0.0.1\t#{ conf[:url]}' | sudo tee -a /etc/hosts"
+        return if path == "" || path == "/"
+
+        if path.start_with? "/"
+          OpsKit.configuration.docroot = path
+        else
+          OpsKit.configuration.docroot = "#{OpsKit.configuration.docroot}/#{path}"
+        end
+      end
     end
+
   end
 end

data/lib/opskit/configuration.rb

@@ -0,0 +1,18 @@
+module OpsKit
+	class Configuration
+    attr_accessor :name
+    attr_accessor :project_root
+    attr_accessor :url
+    attr_accessor :template
+    attr_accessor :docroot
+
+    def initialize name
+      @name = name
+      @project_root = "#{Dir.pwd}/#{name}" # get default location for project folders from ~/.opskit/config.yml or something
+      @url = "dev.#{name}.nl"
+      @template = "apache"
+      @docroot = "#{@project_root}"
+    end
+
+	end
+end

data/lib/opskit/templates/apache.erb.conf

@@ -1,8 +1,8 @@
 <VirtualHost *:80>
     ServerName      <%= url %>
-    DocumentRoot    <%= Dir.pwd %>/<%= docroot %>
+    DocumentRoot    <%= docroot %>
 
-   <Directory "<%= Dir.pwd %>/<%= docroot %>/"
+   <Directory "<%= docroot %>">
     	 Options Indexes FollowSymLinks Includes ExecCGI
    	 AllowOverride All
    	 Require all granted

data/lib/opskit/version.rb

@@ -1,3 +1,3 @@
 module OpsKit
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - "ClikeX\n\n"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - bin/opskit
 - lib/opskit.rb
 - lib/opskit/cli.rb
+- lib/opskit/configuration.rb
 - lib/opskit/host.rb
 - lib/opskit/templates/apache.erb.conf
 - lib/opskit/version.rb
@@ -102,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command line tool to simplify setting up dev environments