marv 0.6.1 → 0.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 62e5f5d28517617ac5c41ebbd236678eb7fe00d7
+  data.tar.gz: 866c15bb2ec6a49f65075cf7234a8d0544e32898
+SHA512:
+  metadata.gz: 769ac0c9e011cc988f2c7dcbee33011d5c4ac122c3da71f38915dbb90a574b747071022a7e0c538809bcb88e8bc3603c402f745a5a3407beac83e2cc5178d0b0
+  data.tar.gz: 99d8be3f3c25dbbe54386523086adb0c40d3da55482d8c2a22e7b9aec82f7f40cae95578393bc89586e7ab961928c43f62380c657765ed2b5f1f0756c5518f2e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.6.2
+* Fix global link
+* Fix server debug mode
+* Fix server restart
+* Optimize server running detection
+
 ## v0.6.1
 * Fix server running message when server not running
 * Use specific version of tilt gem

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.7)
+    addressable (2.3.8)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.9.1)
@@ -19,7 +19,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.0.7)
-    execjs (2.4.0)
+    execjs (2.5.2)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.8)
@@ -43,7 +43,7 @@ GEM
       em-websocket (~> 0.5)
       guard (~> 2.8)
       multi_json (~> 1.8)
-    hashie (3.4.0)
+    hashie (3.4.1)
     highline (1.7.1)
     hike (1.2.3)
     hitimes (1.2.2)
@@ -62,8 +62,8 @@ GEM
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.7)
-    listen (2.9.0)
-      celluloid (>= 0.15.2)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
@@ -101,7 +101,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.12.1)
+    therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/marv/cli/project.rb

@@ -21,7 +21,7 @@ module Marv
       desc "link SERVER or DIRECTORY", "Create a symbolic link to the compilation directory"
       long_desc "This command will symlink the compiled version of the project to the specified server or WordPress install path."+
       "If you don't provide a directory or a server name, the symlink will be created in Marv global themes or plugins folder."
-      def link(dir=nil)
+      def link(dir='global')
         project = Marv::Project::Project.new(self, '.', nil)
         actions = Marv::Project::Actions.new(project, nil)
         actions.link(dir)

data/lib/marv/project/actions.rb

@@ -38,7 +38,7 @@ module Marv
 
       # Link to server
       def link_to_server
-        unless @link_dir.nil?
+        unless @link_dir == 'global'
           path = ::File.join(@global.servers_path, @link_dir, 'wp-content', @link_options[:folder])
 
           if ::File.directory?(path)
@@ -49,17 +49,25 @@ module Marv
 
       # Link to wordpress
       def link_to_folder
-        unless @link_dir.nil?
+        unless @link_dir == 'global'
           if ::File.directory?(@link_dir)
             ::File.join(@link_dir, 'wp-content', @link_options[:folder], ::File.basename(@project.root))
           end
         end
       end
 
+      # Link global
+      def link_global
+        if @link_dir == 'global'
+          ::File.join(@global.global_path, @link_options[:folder], ::File.basename(@project.root))
+        end
+      end
+
       # Link target
       def link_target
         target = link_to_server unless link_to_server.nil?
         target = link_to_folder unless link_to_folder.nil?
+        target = link_global unless link_global.nil?
 
         if target.nil?
           @task.say "Destination server does not exist!", :red

data/lib/marv/server/actions.rb

@@ -40,7 +40,7 @@ module Marv
             ::Process.kill('KILL', pid)
             @task.say "Server #{@name} stopped", :yellow
           end
-        rescue
+        rescue Errno::EPERM, Errno::ESRCH
           @task.say "Server #{@name} is not running", :yellow
         end
       end
@@ -48,6 +48,7 @@ module Marv
       # Initialize server restart
       def restart
         stop
+        sleep 3
         start
       end
 
@@ -71,8 +72,9 @@ module Marv
 
       # Run server
       def run_server
+        ::Dir.chdir @path
+
         unless @debug
-          ::Dir.chdir @path
           @php = ChildProcess.build 'php', '-S', "#{@server.host}:#{@server.port}", 'router.php'
           @php.start
 
@@ -111,16 +113,15 @@ module Marv
 
       # Check if port is available
       def is_server_running?(server=@server)
-        begin
-          pid_file = ::File.join(server.path, 'php.pid')
-          pid = ::File.read(pid_file).to_i
+        pid_file = ::File.join(server.path, 'php.pid')
+        pid = ::File.read(pid_file).to_i
 
+        begin
           ::Process.kill(0, pid)
-        rescue
+          return true
+        rescue Errno::EPERM, Errno::ESRCH
           return false
         end
-
-        return true
       end
 
       # Check if port is available
@@ -128,11 +129,10 @@ module Marv
         begin
           server = ::TCPServer.new(host, port)
           server.close()
-        rescue
+          return true
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, SocketError
           return false
         end
-
-        return true
       end
 
     end

data/lib/marv/server/create.rb

@@ -60,6 +60,8 @@ module Marv
         package = "/tmp/wordpress-#{@config[:wp_version]}.zip"
         # Download package file
         unless ::File.exists?(package)
+          @task.say "Downloading WordPress...", :cyan
+
           @task.get "https://wordpress.org/wordpress-#{@config[:wp_version]}.zip" do |content|
             @task.create_file package, content
           end

data/marv.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: marv 0.6.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "marv"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Jonian Guveli", "Olibia Tsati"]
-  s.date = "2015-03-26"
+  s.date = "2015-04-09"
   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"]
@@ -87,17 +89,15 @@ Gem::Specification.new do |s|
     "lib/marv/server/actions.rb",
     "lib/marv/server/create.rb",
     "lib/marv/server/server.rb",
-    "marv.gemspec",
-    "pkg/marv-0.4.0.gem"
+    "marv.gemspec"
   ]
   s.homepage = "http://hardpixel.github.io/marv"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.2"
   s.summary = "A command-line tool for developing wordpress themes and plugins"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<guard>, ["~> 2.8.0"])

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marv
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.6.2
 platform: ruby
 authors:
 - Jonian Guveli
@@ -10,246 +9,216 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: A toolkit for bootstrapping and developing WordPress themes and plugins
@@ -262,7 +231,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
+- ".document"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -332,30 +301,29 @@ files:
 - lib/marv/server/create.rb
 - lib/marv/server/server.rb
 - marv.gemspec
-- pkg/marv-0.4.0.gem
 homepage: http://hardpixel.github.io/marv
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A command-line tool for developing wordpress themes and plugins
 test_files: []
+has_rdoc: