wp-docker 0.0.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eff499c069bd5495eb0643be4f76fa8164c39f56
-  data.tar.gz: 794abbd90b8a0a17777463ffcb4ce9b86be26660
+  metadata.gz: 251fed4e3a00b33681ceacf7e1e8d115252671dc
+  data.tar.gz: '08944dc38a10df399711d91358e773777d5a7bf1'
 SHA512:
-  metadata.gz: 9405c72167887ffe47f00afddd94844a034e1ac0238d53d925e6a706ff108f3f413597d2cfaa8a9ac9e76acf9a6e3a9dde1def35d5fd04c698a685e3de0b664c
-  data.tar.gz: f10e698257e2e5283607afc27d4c0fa99164145257ffa02fe7b0f1da638186d50bf93e73fa6dd812615885102d7cb8a445fd083a72e19ccecd7b904f61260b99
+  metadata.gz: b24012f68ccd1e8aeca2a4f25169248439f3bc98ae5e9449acb2324126b8a16e74a36f1177918c198ff91d51af92e2cf0c011ed64d309c05c8bf4bc09f1bacfe
+  data.tar.gz: cedc1bed35dcd00b00ff774c35a3b1156ef631c5f23680a74e4af8a72189bbb093263ecc7cceac5adf35f540e94d1e19edcbfc9ada97204eee1f30a562f34111

data/README.md

@@ -1,14 +1,24 @@
-# WP-DOCKER
+# WP-Docker
 
-The easiest to for WordPress using Docker containers
+The easiest way to develop WordPress using Docker containers.
 
 ## Install
 
+```
+# Using RubyGems
+$ sudo gem install wp-docker
+```
+
 ## Usage
 
-WP-DOCKER provides a command-line interface to create and manage WordPress development environments using Docker:
+WP-Docker provides a command-line interface to create and manage WordPress development environments using Docker:
 
 ```
+$ wp-docker 
+
+========================================
+| WordPress Docker Environment Manager |
+========================================
 
 Usage wp-docker <command> [<options>]
 
@@ -26,7 +36,6 @@ Commands:
   help                           Show this help
 ```
 
-
 ## Contributing
 
 * If you have found a bug or if you have a feature request, please report them at this repository issues section.

data/bin/wp-docker

@@ -1,14 +1,11 @@
 #!/usr/bin/env ruby
 
-##
-# Test command: 
-# docker-compose down; rm -rf src; rm docker-compose.yml; rm Dockerfile-wp; wp-docker
-##
-
 require "docker_manager"
 require "config_manager"
 require "commands/_loader"
 
+require "version"
+
 require 'fileutils'
 
 require "highline/import"
@@ -20,76 +17,61 @@ UI_ENV_SPACES = 50
 UI_WEB_SPACES = 15
 UI_DB_SPACES = 15
 
-def main 
-    puts
-    puts "========================================"
-    puts "| WordPress Docker Environment Manager |"
-    puts "========================================"
-    puts
-
-    case ARGV[0]
-    when "create"
-        wp_docker_create
-    when "cli"
-        wp_docker_execute_cli
-    when "open"
-        wp_docker_open_browser
-    when "list"
-        wp_docker_list
-    when "shell"
-        wp_docker_shell
-    when "exec"
-        wp_docker_exec
-    when "start"
-        wp_docker_start
-    when "stop"
-        wp_docker_stop
-    when "remove"
-        wp_docker_remove
-    when "logs"
-        wp_docker_logs
-    else
-        wp_docker_help
-    end
-
-end
-
-
-def wp_docker_start
-    docker_manager = DockerManager.new
-    docker_manager.start ARGV[1]
-end
-
-def wp_docker_stop
-    docker_manager = DockerManager.new
-    docker_manager.stop ARGV[1]
-end
+def main
+  name = "WP-Docker #{CONFIG::VERSION}"
+  puts
+  puts "=================================="
+  puts "| " + fill_spaces(name, 30) + " |"
+  puts "=================================="
+  puts
+
+  case ARGV[0]
+  when "create"
+    wp_docker_create
+  when "cli"
+    wp_docker_execute_cli
+  when "open"
+    wp_docker_open_browser
+  when "list"
+    wp_docker_list
+  when "shell"
+    wp_docker_shell
+  when "exec"
+    wp_docker_exec
+  when "start"
+    wp_docker_start
+  when "stop"
+    wp_docker_stop
+  when "remove"
+    wp_docker_remove
+  when "logs"
+    wp_docker_logs
+  else
+    wp_docker_help
+  end
 
-def wp_docker_remove
-    docker_manager = DockerManager.new
-    docker_manager.remove ARGV[1]
 end
 
 def fill_spaces(text, chars)
-    fills = chars - text.to_s.length
-    return str = text + (" " * fills)
+  fills = chars - text.to_s.length
+  return str = text + (" " * fills)
 end
 
 def docker_start port
-    puts "Start docker compose"
-    system "docker-compose up --build -d"
-    puts
-    puts "Opening browser: http://localhost:#{port}"
-    print "wait ."
-    sleep 5
-    print "."
-    sleep 5
-    print "."
-    sleep 5
-    print "."
-    sleep 5
-    print "."
-    system "open http://localhost:#{port}"
+  puts "Start docker compose"
+  system "docker-compose up --build -d"
+  puts
+  puts "Opening browser: http://localhost:#{port}"
+  print "wait ."
+  sleep 5
+  print "."
+  sleep 5
+  print "."
+  sleep 5
+  print "."
+  sleep 5
+  print "."
+  system "open http://localhost:#{port}"
 
 end
 

data/lib/commands/_loader.rb

@@ -5,4 +5,7 @@ require_relative "./shell"
 require_relative "./cli"
 require_relative "./exec"
 require_relative "./browser"
-require_relative "./logs"
+require_relative "./logs"
+require_relative "./start"
+require_relative "./stop"
+require_relative "./remove"

data/lib/commands/cli.rb

@@ -1,9 +1,15 @@
 def wp_docker_execute_cli 
     config_manager = ConfigManager.new
+    unless config_manager.is_docker_compose_folder
+        puts "docker-compose.yml does not exists in current folder."
+        puts
+        exit
+    end
     name = config_manager.get_wp_container_name
     args = ARGV
     args.slice!(0)
 
     command="docker exec -it " + name + " wp --allow-root " + args.join(" ")
     system(command)
+    puts
 end

data/lib/commands/help.rb

@@ -7,11 +7,11 @@ Commands:
   list                           Show available environments
   cli <command>                  Execute wp-cli in current wp-docker environment
   open                           Open browser
-  shell                          Open shell in web container
+  shell [<environment>]          Open shell in web container
   exec <command>                 Execute command in current wp-docker environment
-  start <environment>            Start wp-docker environment
-  stop <environment>             Stop wp-docker environment
-  remove <environment>           Remove wp-docker environment
+  start [<environment>]          Start wp-docker environment (default: current)
+  stop [<environment>]           Stop wp-docker environment (default: current)
+  remove [<environment>]         Remove wp-docker environment (default: current)
   logs [-t]                      Show apache web logs
   help                           Show this help
   

data/lib/commands/remove.rb

@@ -0,0 +1,15 @@
+def wp_docker_remove
+  config_manager = ConfigManager.new
+
+  if ARGV.count == 2
+    env = ARGV[1]
+  else
+    env = config_manager.get_wp_environment_name
+  end
+
+  if env != nil
+    docker_manager = DockerManager.new
+    docker_manager.remove env
+  end
+
+end

data/lib/commands/shell.rb

@@ -1,7 +1,16 @@
 def wp_docker_shell
-    config_manager = ConfigManager.new
-    name = config_manager.get_wp_container_name
-    command="docker exec -it " + name + " /bin/bash"
-    puts command
+  config_manager = ConfigManager.new
+
+  if ARGV.count == 2
+    container = "wpd_web_" + ARGV[1]
+  else
+    container = config_manager.get_wp_container_name
+  end
+
+  if container != nil
+    command = "docker exec -it " + container + " /bin/bash"
+    puts " - Executing: " + command
+    puts
     system(command)
+  end
 end

data/lib/commands/start.rb

@@ -0,0 +1,15 @@
+def wp_docker_start
+  config_manager = ConfigManager.new
+
+  if ARGV.count == 2
+    env = ARGV[1]
+  else
+    env = config_manager.get_wp_environment_name
+  end
+
+  if env != nil
+    docker_manager = DockerManager.new
+    docker_manager.start env
+  end
+
+end

data/lib/commands/stop.rb

@@ -0,0 +1,15 @@
+def wp_docker_stop
+  config_manager = ConfigManager.new
+
+  if ARGV.count == 2
+    env = ARGV[1]
+  else
+    env = config_manager.get_wp_environment_name
+  end
+
+  if env != nil
+    docker_manager = DockerManager.new
+    docker_manager.stop env
+  end
+
+end

data/lib/config_manager.rb

@@ -7,6 +7,14 @@ class ConfigManager
         return name    
     end
 
+    def get_wp_environment_name
+        file_lines = get_file_lines
+
+        container_line = file_lines.grep(/container_name: wpd_web/)
+        name = container_line[0].scan(/(wpd_[a-z]+)_(.+\d+)/)
+        return name[0][1]
+    end
+
     def get_wp_container_port
         file_lines = get_file_lines
 
@@ -15,18 +23,28 @@ class ConfigManager
         return ret[0][0]
     end
 
+    def is_docker_compose_directory
+
+    end
+
     def get_file_lines
-        if !File.file?("docker-compose.yml")
-            puts "docker-compose.yml does not exists"
+        unless self.is_docker_compose_folder
+            puts "docker-compose.yml does not exists in current directory. Choose one of the available environments."
+            puts
+            wp_docker_list
             exit
         end
 
         file_lines = File.readlines("docker-compose.yml")
-        if !file_lines.grep(/## wp-docker ##/).any?
+        unless file_lines.grep(/## wp-docker ##/).any?
             puts "Invalid docker-compose.yml"
             exit
         end
 
-        return file_lines
-    end 
+        file_lines
+    end
+
+    def is_docker_compose_folder
+        File.file?("docker-compose.yml")
+    end
 end

data/lib/docker_manager.rb

@@ -13,10 +13,19 @@ class DockerManager
         match = Array.new
         match_envs.each do |env|
 
-            web_port = match_web.select { |item| item[1] == env[0] }        
-            db_port = match_db.select { |item| item[1] == env[0] }        
+            web_port_match = match_web.select { |item| item[1] == env[0] }
+            db_port_match = match_db.select { |item| item[1] == env[0] }
 
-            match.push({"env" => env[0], "web_port" => web_port[0][0], "db_port" => db_port[0][0]})
+            web_port = "<stopped>"
+            if web_port_match.count != 0
+                web_port = web_port_match[0][0]
+            end
+
+            db_port = "<stopped>"
+            if db_port_match.count != 0
+                db_port = db_port_match[0][0]
+            end
+            match.push({"env" => env[0], "web_port" => web_port, "db_port" => db_port})
         end
         
         return match

data/lib/version.rb

@@ -0,0 +1,3 @@
+module CONFIG
+  VERSION = "0.1.2"
+end

data/wp-docker.gemspec

@@ -1,9 +1,11 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require "version"
+
 Gem::Specification.new do |spec|
   spec.name = "wp-docker"
-  spec.version = "0.0.1"
+  spec.version = CONFIG::VERSION
   spec.authors = ["Jesus Serrano"]
   spec.email = ["wp-docker@onepointzero.org"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wp-docker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jesus Serrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,9 +72,13 @@ files:
 - lib/commands/help.rb
 - lib/commands/list.rb
 - lib/commands/logs.rb
+- lib/commands/remove.rb
 - lib/commands/shell.rb
+- lib/commands/start.rb
+- lib/commands/stop.rb
 - lib/config_manager.rb
 - lib/docker_manager.rb
+- lib/version.rb
 - templates/Dockerfile-wp
 - templates/docker-compose.yml.tpl
 - templates/gitignore.tpl