marv 0.3.2 → 0.4.0

data/lib/marv/server/actions.rb

@@ -0,0 +1,79 @@
+require 'net/http'
+require 'childprocess'
+
+module Marv
+  module Server
+    class Actions
+
+      # Initialize actions
+      def initialize(server)
+        @server = server
+        @task = server.task
+        @path = server.path
+        @name = server.name
+      end
+
+      # Initialize server start
+      def start
+        # Setup server
+        server = TCPServer.new('127.0.0.1', 0)
+        port = server.addr[1]
+        server.close()
+
+        # Run PHP server
+        ::Dir.chdir @path
+        @php = ChildProcess.build 'php', '-S', "#{@server.host}:#{@server.port}", 'router.php'
+        @php.start
+
+        # Write PHP proccess id to file
+        @task.shell.mute do
+          @task.create_file ::File.join(@path, 'php.pid'), @php.pid, :force => true
+        end
+
+        @task.say "Server #{@server.name} is running", :cyan
+        @task.say "Visit http://#{@server.host}:#{@server.port}", :green
+      end
+
+      # Initialize server stop
+      def stop
+        pid_file = ::File.join(@path, 'php.pid')
+
+        begin
+          if File.exists?(pid_file)
+            pid = ::File.read(pid_file).to_i
+
+            ::Process.kill('KILL', pid)
+            @task.say "Server #{@name} stopped", :yellow
+          end
+        rescue Exception => e
+          @task.say "Server #{@name} is not running", :yellow
+        end
+      end
+
+      # Initialize server restart
+      def restart
+        stop
+        start
+      end
+
+      # Remove server
+      def remove
+        begin
+          @server.remove_database
+
+          @task.shell.mute do
+            stop
+            @task.remove_dir @path
+          end
+        rescue Exception => e
+          @task.say "Error while removing server:"
+          @task.say e.message + "\n", :red
+          exit
+        end
+
+        @task.say "Server successfully removed", :green
+      end
+
+    end
+  end
+end

data/lib/marv/server/create.rb

@@ -0,0 +1,100 @@
+require 'zip'
+
+module Marv
+  module Server
+    class Create
+
+      # Initialize server creator
+      def initialize(server)
+        @server = server
+        @task = server.task
+        @global = Marv::Global.new(server.task)
+        @name = server.name
+        @path = server.path
+        @database = server.database
+        @config = server.config
+
+        create_server
+      end
+
+      # Create server
+      def create_server
+        begin
+          @task.shell.mute do
+            create_server_dir
+            copy_wordpress_files
+            @server.create_database
+            add_config_files
+          end
+        rescue Exception => e
+          @task.say "Error while creating server:"
+          @task.say e.message + "\n", :red
+          abort
+        end
+
+        @task.say "Server #{@name} created successfully!", :green
+        start_server
+      end
+
+      # Starts the new server
+      def start_server
+        unless @task.no?("Would you like to start #{@name} server?")
+          action = Marv::Server::Actions.new(@server)
+          action.start
+        end
+      end
+
+      # Creates a directory for a new server
+      def create_server_dir
+        if ::File.exists?(@server.config_file)
+          @task.say "A server with the name #{@name} already exists", :red
+          abort
+        end
+
+        @task.remove_dir @path
+        @task.empty_directory @path
+      end
+
+      # Downloads WordPress from wordpress.org
+      def download_wordpress
+        package = "/tmp/wordpress-#{@config[:wp_version]}.zip"
+        # Download package file
+        unless ::File.exists?(package)
+          @task.get "https://wordpress.org/wordpress-#{@config[:wp_version]}.zip" do |content|
+            @task.create_file package, content
+          end
+        end
+        # Return package file
+        package
+      end
+
+      # Copy WordPress files
+      def copy_wordpress_files
+        package = download_wordpress
+        tmp_dir = ::File.expand_path "/tmp/wordpress-latest-#{Time.now.to_i}"
+        @task.empty_directory tmp_dir unless ::File.directory?(tmp_dir)
+
+        # Extract package to temporary dir
+        ::Zip.on_exists_proc = true
+        ::Zip::File.open(package) do |zip_file|
+          zip_file.each do |entry|
+            entry.extract(::File.join(tmp_dir, entry.to_s))
+          end
+        end
+
+        @task.directory ::File.join(tmp_dir, 'wordpress'), @path
+        @task.remove_dir tmp_dir
+      end
+
+      # Add configuration files
+      def add_config_files
+        layouts = ::File.join(Marv.root, 'layouts', 'config')
+
+        @global.template ::File.join(layouts, 'server.rb'), ::File.join(@path, 'config.rb'), @server.context
+        @global.template ::File.join(layouts, 'router.php'), ::File.join(@path, 'router.php'), @server.context
+        @global.template ::File.join(layouts, 'wp-config.php'), ::File.join(@path, 'wp-config.php'), @server.context
+      end
+
+    end
+  end
+end

data/lib/marv/server/server.rb

@@ -0,0 +1,201 @@
+require 'mysql2'
+
+require 'marv/server/actions'
+require 'marv/server/create'
+
+module Marv
+  module Server
+    class Server
+
+      attr_accessor :task, :name, :path, :config, :host, :port, :database, :context
+
+      # Initialize server config
+      def initialize(task, dir)
+        @task = task
+        @global = Marv::Global.new(task)
+        @name = dir
+        @path = server_path
+        @config_file = config_file
+        @options = server_options
+        @config = server_config
+        @host = server_host
+        @port = server_port
+        @database = db_client
+        @context = server_context
+
+        @global.clean_broken_links(server_projects_paths)
+      end
+
+      # Server path
+      def server_path
+      	::File.join(@global.servers_path, @name)
+      end
+
+      # Config file
+      def config_file
+        ::File.join(server_path, 'config.rb')
+      end
+
+      # Database name
+      def db_name
+        'marv_'+@name.gsub(/\W/, '_').downcase
+      end
+
+      # Database username
+      def db_user
+        @config[:db_user]
+      end
+
+      # Database user password
+      def db_password
+        @config[:db_password]
+      end
+
+      # Database host
+      def db_host
+        @config[:db_host]
+      end
+
+      # Database port
+      def db_port
+        @config[:db_port]
+      end
+
+      # Wordpress version
+      def wp_version
+        @config[:wp_version]
+      end
+
+      # Server host
+      def server_host
+        @config[:server_host]
+      end
+
+      # Server port
+      def server_port
+        @config[:server_port]
+      end
+
+      # Server config file
+      def server_config
+        config = @global.config
+
+        # Check for user options
+        unless @options.nil?
+          config.merge!(@options)
+        end
+
+        # Check for config.rb in server folder
+        if ::File.exists?(@config_file)
+          config.merge!(@global.load_ruby_config(@config_file))
+        end
+
+        return config
+      end
+
+      # Ask for server options
+      def server_options
+        options = {}
+
+        unless ::File.exists?(@config_file)
+          @task.say "This will create a new development server.", :cyan
+          @task.say "Please enter server settings below."
+
+          options.merge!(ask_server_details)
+          options.merge!(ask_database_details)
+          options.merge!(ask_wordpress_details)
+        end
+
+        return options
+      end
+
+      # Server details
+      def ask_server_details
+        options = {}
+        options[:server_host] = @task.ask "Where do you want to run the server?", :default => @global.config[:server_host]
+        options[:server_port] = @task.ask "Which port do you want to use?", :default => @global.config[:server_port]
+
+        return options
+      end
+
+      # Database details
+      def ask_database_details
+        options = {}
+        options[:db_user] = @task.ask "MySQL database username?", :default => @global.config[:db_user]
+        options[:db_password] = @task.ask "MySQL database password?", :default => @global.config[:db_password]
+        options[:db_host] = @task.ask "MySQL database host?", :default => @global.config[:db_host]
+        options[:db_port] = @task.ask "MySQL database port?", :default => @global.config[:db_port]
+
+        return options
+      end
+
+      # Wordpress details
+      def ask_wordpress_details
+        options = {}
+        options[:wp_version] = @task.ask "WordPress version to install?", :default => @global.config[:wp_version]
+
+        return options
+      end
+
+      # Server database
+      def db_client
+        ::Mysql2::Client.new(:host => db_host, :port => db_port, :username => db_user, :password => db_password)
+      end
+
+      # MySQL create database
+      def db_client_create
+        @database.query("CREATE DATABASE IF NOT EXISTS #{db_name}")
+      end
+
+      # MySQL create database
+      def db_client_drop
+        @database.query("DROP DATABASE IF EXISTS #{db_name}")
+      end
+
+      # MySQL grant all privileges
+      def db_client_grant_all
+        @database.query("GRANT ALL PRIVILEGES ON #{db_name}.* TO '#{@db_user}'@'#{db_host}'")
+      end
+
+      # MySQL revoke all privileges
+      def db_client_revoke_all
+        @database.query("REVOKE ALL PRIVILEGES ON #{db_name}.* FROM '#{@db_user}'@'#{db_host}'")
+      end
+
+      # MySQL flush privileges
+      def db_client_flush_priv
+        @database.query("FLUSH PRIVILEGES")
+      end
+
+      # Create MySQL database
+      def create_database
+        db_client_create
+        db_client_grant_all
+        db_client_flush_priv
+        @database.close
+      end
+
+      # Remove MySQL database
+      def remove_database
+        db_client_drop
+        db_client_revoke_all
+        db_client_flush_priv
+        @database.close
+      end
+
+      # Get server class context
+      def server_context
+        instance_eval('binding')
+      end
+
+      # Server projects paths
+      def server_projects_paths
+        paths = ::Dir.glob(::File.join(server_path, 'wp-content', 'themes', '*'))
+        paths = paths + ::Dir.glob(::File.join(server_path, 'wp-content', 'plugins', '*'))
+
+        return paths
+      end
+
+    end
+  end
+end

data/marv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonian Guveli", "Olibia Tsati"]
-  s.date = "2014-09-19"
+  s.date = "2014-09-30"
   s.description = "A toolkit for bootstrapping and developing WordPress themes and plugins using Sass, LESS, and CoffeeScript."
   s.email = "info@hardpixel.eu"
   s.executables = ["marv"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".rspec",
+    ".document",
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
@@ -27,63 +27,67 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/marv",
-    "features/step_definitions/marv_steps.rb",
-    "features/support/env.rb",
-    "layouts/config/project-config.rb",
-    "layouts/config/router.php.erb",
-    "layouts/config/wp-config.php.erb",
-    "layouts/plugin/functions/plugin.php.erb",
-    "layouts/plugin/images/screenshot.png",
-    "layouts/plugin/javascripts/admin.coffee",
-    "layouts/plugin/javascripts/admin.js",
-    "layouts/plugin/javascripts/plugin.coffee",
-    "layouts/plugin/javascripts/plugin.js",
-    "layouts/plugin/stylesheets/plugin.scss",
-    "layouts/theme/functions/functions.php.erb",
-    "layouts/theme/images/screenshot.png",
-    "layouts/theme/includes/filters-admin.php.erb",
-    "layouts/theme/includes/filters.php.erb",
-    "layouts/theme/includes/helpers.php.erb",
-    "layouts/theme/javascripts/admin.coffee",
-    "layouts/theme/javascripts/admin.js",
-    "layouts/theme/javascripts/theme.coffee",
-    "layouts/theme/javascripts/theme.js",
-    "layouts/theme/stylesheets/_header.scss.erb",
-    "layouts/theme/stylesheets/style.scss.erb",
-    "layouts/theme/templates/404.php.erb",
-    "layouts/theme/templates/archive.php.erb",
-    "layouts/theme/templates/author.php.erb",
+    "layouts/config/global.rb",
+    "layouts/config/project.rb",
+    "layouts/config/router.php",
+    "layouts/config/server.rb",
+    "layouts/config/wp-config.php",
+    "layouts/plugin/assets/images/screenshot.png",
+    "layouts/plugin/assets/javascripts/admin.coffee",
+    "layouts/plugin/assets/javascripts/admin.js",
+    "layouts/plugin/assets/javascripts/plugin.coffee",
+    "layouts/plugin/assets/javascripts/plugin.js",
+    "layouts/plugin/assets/stylesheets/plugin.scss",
+    "layouts/plugin/functions/plugin.php",
+    "layouts/theme/assets/images/screenshot.png",
+    "layouts/theme/assets/javascripts/admin.coffee",
+    "layouts/theme/assets/javascripts/admin.js",
+    "layouts/theme/assets/javascripts/theme.coffee",
+    "layouts/theme/assets/javascripts/theme.js",
+    "layouts/theme/assets/stylesheets/_header.scss",
+    "layouts/theme/assets/stylesheets/style.scss",
+    "layouts/theme/functions/functions.php",
+    "layouts/theme/includes/filters-admin.php",
+    "layouts/theme/includes/filters.php",
+    "layouts/theme/includes/helpers.php",
     "layouts/theme/templates/footer.php",
     "layouts/theme/templates/header.php",
     "layouts/theme/templates/index.php",
     "layouts/theme/templates/page.php",
-    "layouts/theme/templates/partials/comments.php.erb",
-    "layouts/theme/templates/partials/content-none.php.erb",
+    "layouts/theme/templates/pages/404.php",
+    "layouts/theme/templates/pages/archive.php",
+    "layouts/theme/templates/pages/author.php",
+    "layouts/theme/templates/pages/search.php",
+    "layouts/theme/templates/partials/comments.php",
+    "layouts/theme/templates/partials/content-none.php",
     "layouts/theme/templates/partials/content-page.php",
     "layouts/theme/templates/partials/content-single.php",
-    "layouts/theme/templates/partials/content.php.erb",
-    "layouts/theme/templates/partials/searchform.php.erb",
+    "layouts/theme/templates/partials/content.php",
+    "layouts/theme/templates/partials/searchform.php",
     "layouts/theme/templates/partials/sidebar.php",
-    "layouts/theme/templates/search.php.erb",
     "layouts/theme/templates/single.php",
-    "lib/guard/marv/assets.rb",
-    "lib/guard/marv/config.rb",
-    "lib/guard/marv/folders.rb",
-    "lib/guard/marv/functions.rb",
-    "lib/guard/marv/templates.rb",
     "lib/marv.rb",
-    "lib/marv/builder.rb",
     "lib/marv/cli.rb",
-    "lib/marv/engines.rb",
-    "lib/marv/error.rb",
-    "lib/marv/generator.rb",
-    "lib/marv/guard.rb",
-    "lib/marv/project.rb",
-    "lib/marv/server.rb",
-    "marv-0.3.2.gem",
-    "marv.gemspec",
-    "spec/lib/marv/project_spec.rb",
-    "spec/spec_helper.rb"
+    "lib/marv/cli/project.rb",
+    "lib/marv/cli/server.rb",
+    "lib/marv/global.rb",
+    "lib/marv/project/actions.rb",
+    "lib/marv/project/builder.rb",
+    "lib/marv/project/builder/assets.rb",
+    "lib/marv/project/builder/engines.rb",
+    "lib/marv/project/builder/functions.rb",
+    "lib/marv/project/builder/templates.rb",
+    "lib/marv/project/create.rb",
+    "lib/marv/project/guard.rb",
+    "lib/marv/project/guard/assets.rb",
+    "lib/marv/project/guard/config.rb",
+    "lib/marv/project/guard/functions.rb",
+    "lib/marv/project/guard/templates.rb",
+    "lib/marv/project/project.rb",
+    "lib/marv/server/actions.rb",
+    "lib/marv/server/create.rb",
+    "lib/marv/server/server.rb",
+    "marv.gemspec"
   ]
   s.homepage = "http://hardpixel.github.io/marv"
   s.licenses = ["MIT"]
@@ -98,54 +102,48 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, [">= 0.19.1"])
       s.add_runtime_dependency(%q<guard-livereload>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<sprockets>, [">= 2.12.0"])
-      s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_runtime_dependency(%q<childprocess>, [">= 0.3.5"])
       s.add_runtime_dependency(%q<mysql2>, [">= 0.3.15"])
+      s.add_runtime_dependency(%q<uglifier>, [">= 2.5.0"])
       s.add_runtime_dependency(%q<sass>, [">= 3.3.0"])
       s.add_runtime_dependency(%q<less>, [">= 2.6.0"])
       s.add_runtime_dependency(%q<coffee-script>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<therubyracer>, [">= 0.12.0"])
-      s.add_runtime_dependency(%q<uglifier>, [">= 2.5.0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<aruba>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyzip>, [">= 1.1.6"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
     else
       s.add_dependency(%q<thor>, [">= 0.19.1"])
       s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
       s.add_dependency(%q<sprockets>, [">= 2.12.0"])
-      s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
       s.add_dependency(%q<childprocess>, [">= 0.3.5"])
       s.add_dependency(%q<mysql2>, [">= 0.3.15"])
+      s.add_dependency(%q<uglifier>, [">= 2.5.0"])
       s.add_dependency(%q<sass>, [">= 3.3.0"])
       s.add_dependency(%q<less>, [">= 2.6.0"])
       s.add_dependency(%q<coffee-script>, [">= 2.3.0"])
       s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
-      s.add_dependency(%q<uglifier>, [">= 2.5.0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<aruba>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.19.1"])
     s.add_dependency(%q<guard-livereload>, [">= 2.3.0"])
     s.add_dependency(%q<sprockets>, [">= 2.12.0"])
-    s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
     s.add_dependency(%q<childprocess>, [">= 0.3.5"])
     s.add_dependency(%q<mysql2>, [">= 0.3.15"])
+    s.add_dependency(%q<uglifier>, [">= 2.5.0"])
     s.add_dependency(%q<sass>, [">= 3.3.0"])
     s.add_dependency(%q<less>, [">= 2.6.0"])
     s.add_dependency(%q<coffee-script>, [">= 2.3.0"])
     s.add_dependency(%q<therubyracer>, [">= 0.12.0"])
-    s.add_dependency(%q<uglifier>, [">= 2.5.0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<aruba>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rubyzip>, [">= 1.1.6"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
   end
 end