dir_dsl 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDUwNjVmYzc1MmIyYjNjNzFkZWQ5OGJiMzY1MTNjZjk3NDE5ZTU5OQ==
+    MzE5NmM3YjgxNjFiNzA2NWVmZThhNjk2NmM1NWFjMjE1NmZiZWFiMw==
   data.tar.gz: !binary |-
-    NmFkOGM0NWNkOTRkM2IzNDU1OWYzZTM1ZDZiZmI5MzhjN2Q3MGQyYg==
+    NGUzNjZjMGJlZjgyNDY3ODNjM2IwMTJkMjMxOGQyN2ViZjgwMTYyNQ==
 SHA512:
   metadata.gz: !binary |-
-    OWU3YWZkNDYwYjc0ZWM4YmM0MDA0MTg3MjYyMjBlOGViNDVjODk0ZDcwZDY3
-    YWQ1MjljZTNlZjU2OTQ3YmQ1MmYyZWZlMjFiMjk3Mjc0MThlZjY2MmU4ZDUw
-    ZGE0MTYwZTdjMzNjMmY5MTE3NTc3NDViOGM2YjA5ZjdjNTYxZTU=
+    N2ZjNWQ2NWYwOTBhMDIwMmM3YTM5YWFiYjgwYjhiZjUwMWI4MTYwODdkZmQw
+    N2U2MzgzZmY0ZGRjMDkxYWYyZTRmMjUwNmE5OTZlMTBkMjBjYzk5NjMyNTIx
+    NTAyZDA2ZTMyYTI4NWEyMDljNTFmMTcwYzQyNWNjNDVkMGVhNGU=
   data.tar.gz: !binary |-
-    NGEwOTE0YjU0MGIxMjczNWQzNzZmYWE2OTc5NjE1OTI5NjQyNTQ5NTQ3ZGRl
-    YmZkYTExN2U1Y2Y2ZTczZDc5MWEwYzE1OTUxYjMzYmE0ODk1YmZmMWZhNjNj
-    YzMxNjE1ZjNkMzdjYjA1OWU5ZTNjZWE2MmM5ZDJmNGY4Y2FlNzQ=
+    YThlYWYzZTE2YmIxMjgwZTJiZWVhYzI1OTNlZWZkNjBiMGM0ODE0N2RmZWFh
+    Yzk1NmY0NDA4OWE4MmIxMTM3ODk2MWE5Njg0ZWUwNzc1MTZhZjkxYWYxZTI2
+    MzBmODE1ZjhhMmY5NDY2ODQ2MzAyZjlhZjk4YWFjMWYzMzI4OGY=

data/.idea/dir_dsl.iml

@@ -18,7 +18,6 @@
     <orderEntry type="library" scope="PROVIDED" name="file_utils (v1.0.7, RVM: ruby-1.9.3-p448 [dir_dsl]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="gemcutter (v0.7.1, RVM: ruby-1.9.3-p448 [dir_dsl]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="gemspec_deps_gen (v1.1.2, RVM: ruby-1.9.3-p448 [dir_dsl]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="meta_methods (v1.0.5, RVM: ruby-1.9.3-p448 [dir_dsl]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="metaclass (v0.0.1, RVM: ruby-1.9.3-p448 [dir_dsl]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mocha (v0.14.0, RVM: ruby-1.9.3-p448 [dir_dsl]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec (v2.14.1, RVM: ruby-1.9.3-p448 [dir_dsl]) [gem]" level="application" />

data/CHANGES

@@ -3,3 +3,7 @@
 == Version 1.0.0
 
 * Initial release.
+
+== Version 1.0.1
+
+* Bug fixes.

data/Gemfile

@@ -1,7 +1,6 @@
 source "https://rubygems.org"
 
 group :default do
-  gem "meta_methods"
   gem "file_utils"
 end
 

data/Gemfile.lock

@@ -7,7 +7,6 @@ GEM
     gemspec_deps_gen (1.1.2)
       bundler
       file_utils
-    meta_methods (1.0.5)
     metaclass (0.0.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
@@ -27,6 +26,5 @@ DEPENDENCIES
   file_utils
   gemcutter
   gemspec_deps_gen
-  meta_methods
   mocha
   rspec

data/Rakefile

@@ -35,3 +35,8 @@ RSpec::Core::RakeTask.new do |task|
   task.pattern = 'spec/**/*_spec.rb'
   task.verbose = false
 end
+
+task :fix_debug do
+  system "mkdir -p $GEM_HOME/gems/debugger-ruby_core_source-1.2.3/lib"
+  system "cp -R ~/debugger-ruby_core_source/lib $GEM_HOME/gems/debugger-ruby_core_source-1.2.3"
+end

data/dir_dsl.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__) + '/lib/dir_dsl/version')
+
+Gem::Specification.new do |spec|
+  spec.name          = "dir_dsl"
+  spec.summary       = %q{Library for working with files and directories file in DSL-way }
+  spec.description   = %q{Library for working with files and directories in DSL-way }
+  spec.email         = "alexander.shvets@gmail.com"
+  spec.authors       = ["Alexander Shvets"]
+  spec.homepage      = "http://github.com/shvets/dir_dsl"
+
+  spec.files         = `git ls-files`.split($\)
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  spec.version       = DirDSL::VERSION
+
+  
+  spec.add_runtime_dependency "file_utils", [">= 0"]
+  spec.add_development_dependency "gemspec_deps_gen", [">= 0"]
+  spec.add_development_dependency "gemcutter", [">= 0"]
+
+end
+

data/lib/dir_dsl/dir_dsl.rb

@@ -1,27 +1,25 @@
 require 'file_utils/file_utils'
-require 'meta_methods'
 
 class DirDSL
   include FileUtils
-  include MetaMethods
 
-  def initialize name, basedir
-    @name = name
-    @basedir = File.expand_path(basedir)
-  end
+  attr_reader :from_root, :to_root
 
-  def build(name=nil, &execute_block)
-    name = name.nil? ? @name : name
+  def initialize from_root, to_root
+    @from_root = File.expand_path(from_root)
+    @to_root = File.expand_path(to_root)
+  end
 
-    evaluate_dsl(self, nil, execute_block)
+  def build(&block)
+    self.instance_eval(&block)
   end
 
   def entry_exist? entry_name
-    File.exist? full_name("#@name/#{entry_name}")
+    File.exist? "#{to_root}/#{entry_name}"
   end
 
   def entries_size
-    list = Dir.glob("#{full_name(@name)}/**/*")
+    list = Dir.glob("#{to_root}/**/*")
 
     cnt = 0
     list.each do |name|
@@ -32,19 +30,19 @@ class DirDSL
   end
 
   def list dir="."
-    list = pattern_to_files full_name("#@name/#{dir}"), "**/*"
+    list = pattern_to_files"#{from_root}/#{dir}", "**/*"
 
     list.each_with_index do |name, index|
-      list[index] = name[full_name("#@name/#{dir}").length+1..-1]
+      list[index] = name["#{from_root}/#{dir}".length+1..-1]
     end
   end
 
   def file params
-    to_dir = to_dir(params[:name], params[:to_dir])
+    to_dir = to_dir(params[:to_dir], params[:name])
 
-    create_directory full_name(to_dir)
+    create_directory to_dir unless File.exist? to_dir
 
-    write_to_file full_name(params[:name]), full_name("#{to_dir}/#{File.basename(params[:name])}")
+    write_to_file "#{from_root}/#{params[:name]}", "#{to_dir}/#{File.basename(params[:name])}"
   end
 
   def content params
@@ -53,52 +51,42 @@ class DirDSL
     stream = source.kind_of?(String) ? StringIO.new(source) : source
     content = stream.read
 
-    to_dir = to_dir(params[:name], params[:to_dir])
+    to_dir = to_dir(params[:to_dir], params[:name])
 
-    create_directory full_name(to_dir)
+    create_directory to_dir unless File.exist? to_dir
 
-    write_content_to_file content, full_name("#{to_dir}/#{File.basename(params[:name])}")
+    write_content_to_file content, "#{to_dir}/#{File.basename(params[:name])}"
   end
 
   def directory params
     if params[:from_dir].nil?
-      create_empty_directory params[:to_dir]
+      to_dir = "#{to_root}/#{params[:to_dir]}"
+
+      create_directory to_dir unless File.exist? to_dir
     else
       if params[:to_dir] == "." || params[:to_dir].nil?
-        to_dir = "#@name"
+        to_dir = params[:from_dir]
       else
-        to_dir = "#@name/#{params[:to_dir]}"
+        to_dir = params[:to_dir]
       end
 
       filter = params[:filter].nil? ? "**/*" : params[:filter]
 
-      copy_files full_name(params[:from_dir]), full_name(to_dir), filter
+      copy_files "#{from_root}/#{params[:from_dir]}", "#{to_root}/#{to_dir}", filter
     end
   end
 
   private
 
-  def to_dir name, dir
+  def to_dir dir, name
     if dir.nil?
       from_dir = File.dirname(name)
-      (from_dir == ".") ? @name : "#@name/#{from_dir}"
+      to_dir = (from_dir == ".") ? to_root : "#{to_root}/#{from_dir}"
     else
-      (dir == ".") ? @name : "#@name/#{dir}"
+      to_dir = (dir == ".") ? to_root : "#{to_root}/#{dir}"
     end
-  end
-
-  def create_empty_directory dir
-    to_dir = (dir == ".") ? @name : "#@name/#{dir}"
-
-    create_directory full_name(to_dir)
-  end
-
-  def full_name? name
-    File.expand_path(name) == name
-  end
 
-  def full_name name
-    full_name?(name) ? name : "#@basedir/#{name}"
+    to_dir
   end
 
 end

data/lib/dir_dsl/version.rb

@@ -1,3 +1,3 @@
 class DirDSL
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/dir_dsl_spec.rb

@@ -6,12 +6,13 @@ require 'file_utils/file_utils'
 describe DirDSL do
   include FileUtils
 
-  let(:basedir) { "#{File.dirname(__FILE__)}/.." }
+  let(:from_basedir) { "#{File.dirname(__FILE__)}/.." }
+  let(:to_basedir) { "#{File.dirname(__FILE__)}/../build" }
 
-  subject { DirDSL.new("build/test", basedir) }
+  subject { DirDSL.new(from_basedir, to_basedir) }
 
   after do
-    delete_directory "#{basedir}/build"
+    delete_directory "#{to_basedir}"
   end
 
   it "should create new directory with files at particular folder" do
@@ -38,7 +39,7 @@ describe DirDSL do
   end
 
   it "should create new directory with file created from file" do
-    src = File.open("#{basedir}/Rakefile")
+    src = File.open("#{from_basedir}/Rakefile")
     subject.build do
       content :name => "Rakefile", :source => src
     end
@@ -68,7 +69,7 @@ describe DirDSL do
       directory :from_dir => "spec"
     end
 
-    subject.list.should include "spec_helper.rb"
+    subject.list("spec").should include "spec_helper.rb"
   end
 
   it "should display files in specified subdirectory" do
@@ -76,7 +77,7 @@ describe DirDSL do
       directory :from_dir => "lib"
     end
 
-    subject.list("dir_dsl").first.should =~ %r{dir_dsl.rb}
+    subject.list("lib/dir_dsl").first.should =~ %r{dir_dsl.rb}
   end
 
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dir_dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: meta_methods
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: file_utils
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +75,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- dir_dsl.gemspec
 - dir_dsl.gemspec.erb
 - lib/dir_dsl.rb
 - lib/dir_dsl/dir_dsl.rb