pione 0.2.2 → 0.3.0

data/lib/pione/lang/variable.rb

@@ -0,0 +1,35 @@
+module Pione
+  module Lang
+    # Variable is a model for variable name objects that have name string and
+    # package id. We use this for getting its value from variable table in the
+    # environment.
+    #
+    # @note Be careful variable are not treated as a sequence, because sequence
+    #   is a concept of elements joined by sequencial operators and the
+    #   receivers should be evaluated.
+    class Variable < Expr
+      pione_type TypeVariable
+      member :name
+      member :package_id
+
+      # Get the value from variable table in the environment.
+      def eval(env)
+        env.variable_get(self)
+      end
+
+      def eval!(env)
+        eval(env).eval!(env)
+      end
+
+      def textize
+        ("$%s" % name) + (package_id ? "@%s" % package_id : "")
+      end
+
+      # Compare with other variable.
+      def <=>(other)
+        raise ArgumentError.new(other) unless other.kind_of?(self.class)
+        name <=> other.name
+      end
+    end
+  end
+end

data/lib/pione/location.rb

@@ -3,7 +3,16 @@ module Pione
   module Location; end
 end
 
-require 'pione/location/exception.rb'
+require 'pione/location/location-exception.rb'
+
+# URI schemes
+require 'pione/location/location-scheme'
+require 'pione/location/local-scheme'
+require 'pione/location/dropbox-scheme'
+require 'pione/location/broadcast-scheme'
+require 'pione/location/myftp-scheme'
+
+# storage
 require 'pione/location/basic-location'
 require 'pione/location/data-location'
 require 'pione/location/local-location'
@@ -11,5 +20,8 @@ require 'pione/location/ftp-location'
 require 'pione/location/http-location'
 require 'pione/location/https-location'
 require 'pione/location/dropbox-location'
+
+# others
 require 'pione/location/git-repository-location'
 
+

data/lib/pione/{uri-scheme → location}/broadcast-scheme.rb

@@ -1,9 +1,9 @@
 module Pione
-  module URIScheme
+  module Location
     # BroadcastScheme is a scheme for representing broadcast address.
     # @example
     #   URI.parse("broadcast://255.255.255.255:560001")
-    class BroadcastScheme < BasicScheme('broadcast')
+    class BroadcastScheme < LocationScheme('broadcast')
       # @api private
       COMPONENT = [:scheme, :host, :port]
     end

data/lib/pione/location/data-location.rb

@@ -56,8 +56,8 @@ module Pione
         raise ArgumentError.new(uri) unless @uri.scheme = scheme
       end
 
-      # Copy the content to temporary local location and return it. If the
-      # scheme is local, return itselft.
+      # Copy the content to temporary local location and return the location. If
+      # the scheme is local, return itself.
       def local
         if scheme == "local"
           self
@@ -66,6 +66,11 @@ module Pione
         end
       end
 
+      # Return true if scheme of the location is local.
+      def local?
+        scheme == "local"
+      end
+
       # Create new location appended the name.
       #
       # @param name [String]
@@ -102,6 +107,11 @@ module Pione
         File.extname(basename)
       end
 
+      # Return the dirname of location. This method returns it as a location.
+      def dirname
+        rebuild(@path.dirname).as_directory
+      end
+
       # Rebuild location with the path.
       #
       # @param path [Pathname]
@@ -110,9 +120,9 @@ module Pione
       #   location with new path
       def rebuild(path)
         scheme = @uri.scheme
-        auth = "%s:%s@" % [@uri.user, @uri.password] if @uri.user and @uri.password
+        auth = @uri.user and @uri.password ? "%s:%s@" % [@uri.user, @uri.password] : ""
         host = @uri.host
-        port = ":%i" % @uri.port
+        port = @uri.port ? ":%i" % @uri.port : ""
         path = path.expand_path("/").to_s
         Location["%s://%s%s%s%s" % [scheme, auth, host, port, path]]
       end
@@ -189,6 +199,13 @@ module Pione
         raise NotImplementedError
       end
 
+      # Set last modification time of the location.
+      #
+      # @return [void]
+      def mtime=(time)
+        raise NotImplementedError
+      end
+
       # Return byte size of data in the location.
       #
       # @return [Integer]
@@ -201,7 +218,7 @@ module Pione
       #
       # @return [Array<Location>]
       #   entries of the location
-      def entries
+      def entries(&b)
         raise NotImplementedError
       end
 

data/lib/pione/location/dropbox-location.rb

@@ -13,10 +13,10 @@ module Pione
         #   tuple space server
         # @return [void]
         def self.init(tuple_space_server)
-          tuple_consumer_key = Tuple[:attribute].new("dropbox_consumer_key", nil)
-          tuple_consumer_secret = Tuple[:attribute].new("dropbox_consumer_secret", nil)
-          tuple_access_token_key = Tuple[:attribute].new("dropbox_access_token_key", nil)
-          tuple_access_token_secret = Tuple[:attribute].new("dropbox_access_token_secret", nil)
+          tuple_consumer_key = TupleSapce::AttributeTuple.new("dropbox_consumer_key", nil)
+          tuple_consumer_secret = TupleSpace::AttributeTuple.new("dropbox_consumer_secret", nil)
+          tuple_access_token_key = TupleSpace::AttributeTuple.new("dropbox_access_token_key", nil)
+          tuple_access_token_secret = TupleSpace::AttributeTuple.new("dropbox_access_token_secret", nil)
 
           consumer_key = tuple_space_server.read(tuple_consumer_key, 0).value rescue nil
           consumer_secret = tuple_space_server.read(tuple_consumer_secret, 0).value rescue nil
@@ -42,10 +42,10 @@ module Pione
         # @return [void]
         def share_access_token(tuple_space_server, consumer_key, consumer_secret)
           access_token = session.get_access_token
-          [ Tuple[:attribute].new("dropbox_consumer_key", consumer_key),
-            Tuple[:attribute].new("dropbox_consumer_secret", consumer_secret),
-            Tuple[:attribute].new("dropbox_access_token_key", access_token.key),
-            Tuple[:attribute].new("dropbox_access_token_secret", access_token.secret)
+          [ TupleSpace::AttributeTuple.new("dropbox_consumer_key", consumer_key),
+            TupleSpace::AttributeTuple.new("dropbox_consumer_secret", consumer_secret),
+            TupleSpace::AttributeTuple.new("dropbox_access_token_key", access_token.key),
+            TupleSpace::AttributeTuple.new("dropbox_access_token_secret", access_token.secret)
           ].each {|tuple| tuple_space_server.write(tuple) }
         end
 
@@ -74,6 +74,7 @@ module Pione
 
       def create(data)
         @client.put_file(@path, StringIO.new(data))
+        return self
       end
 
       def read
@@ -82,6 +83,7 @@ module Pione
 
       def update(data)
         @client.put_file(@path, StringIO.new(data), true)
+        return self
       end
 
       def delete

data/lib/pione/{uri-scheme → location}/dropbox-scheme.rb

@@ -1,7 +1,7 @@
 module Pione
-  module URIScheme
+  module Location
     # Dropbox is a scheme for dropbox.
-    class DropboxScheme < BasicScheme('dropbox', :storage => true)
+    class DropboxScheme < LocationScheme('dropbox', :storage => true)
       # @api private
       COMPONENT = [:scheme, :path]
     end

data/lib/pione/location/ftp-location.rb

@@ -33,6 +33,7 @@ module Pione
             ftp.put(path, @path.to_s)
           end
         end
+        return self
       end
 
       def append(data)
@@ -41,6 +42,7 @@ module Pione
         else
           create(data)
         end
+        return self
       end
 
       def read
@@ -75,6 +77,10 @@ module Pione
         connect {|ftp| exist? ? ftp.mtime(@path.to_s) : (raise NotFound.new(self))}
       end
 
+      def mtime=(time)
+
+      end
+
       def size
         connect {|ftp| exist? ? ftp.size(@path.to_s) : (raise NotFound.new(self))}
       end

data/lib/pione/location/git-repository-location.rb

@@ -21,7 +21,7 @@ module Pione
 
       # Return the local location of repository.
       def local
-        Global.git_repository_directory + @address_digest
+        return Global.git_repository_directory + @address_digest
       end
 
       # Return true if the local location exists.
@@ -75,8 +75,6 @@ module Pione
 
       # Export git repository by hash id.
       def export(location)
-        clone_to_local unless has_local?
-
         hash_id = compact_hash_id
 
         # git archive
@@ -91,16 +89,7 @@ module Pione
         end
 
         # unzip
-        local = Location[Temppath.mkdir]
-        Util::Zip.uncompress(Location[path], local)
-
-        # update package.yml
-        info = YAML.load((local + "package.yml").read)
-        info["HashID"] = hash_id
-        (local + "package.yml").update(YAML.dump(info))
-
-        # upload
-        local.entries.each {|entry| entry.move(location)}
+        Util::Zip.uncompress(Location[path], location)
       end
 
       private
@@ -118,14 +107,14 @@ module Pione
         process.start
         process.wait
 
-        # show debug message
-        out.rewind
-        ErrorReport.debug("git clone: %s" % out.read, self, __FILE__, __LINE__)
-
         # check the process result
         if process.crashed?
           raise GitError.new(self, message: "'git clone' failed")
         end
+
+        # show debug message
+        out.rewind
+        Log::Debug.system("git clone: %s" % out.read)
       end
 
       # Return short hash id.

data/lib/pione/{uri-scheme → location}/git-scheme.rb

@@ -1,10 +1,10 @@
 module Pione
-  module URIScheme
+  module LocationScheme
     # GitScheme is a scheme for PIONE package in git repository.
     #
     # @example
     #   URI.parse("git://github.com/pione/pione.git")
-    class GitScheme < BasicScheme('git', :storage => false)
+    class GitScheme < LocationScheme('git', :storage => false)
 
       COMPONENT = [:scheme, :host, :port, :path]
     end

data/lib/pione/location/http-location.rb

@@ -31,8 +31,15 @@ module Pione
         false
       end
 
-      def copy(dest)
+      def copy(dest, option={})
+        # setup options
+        option[:keep_mtime] ||= true
+
+        # copy
         http_get {|rec| dest.write rec.body}
+
+        # modify mtime
+        dest.mtime = self.mtime if option[:keep_mtime]
       end
 
       private

data/lib/pione/location/local-location.rb

@@ -22,6 +22,7 @@ module Pione
           @path.dirname.mkpath unless @path.dirname.exist?
           @path.open("w"){|f| f.write(data)}
         end
+        return self
       end
 
       def append(data)
@@ -30,6 +31,7 @@ module Pione
         else
           create(data)
         end
+        return self
       end
 
       def read
@@ -62,11 +64,15 @@ module Pione
         @path.exist? ? @path.mtime : (raise NotFound.new(self))
       end
 
+      def mtime=(time)
+        @path.utime(@path.atime, time)
+      end
+
       def size
         @path.exist? ? @path.size : (raise NotFound.new(self))
       end
 
-      def entries(option={})
+      def entries(option={rec: false})
         rel_entries(option).map do |entry|
           Location["local:%s" % (@path + entry).expand_path]
         end
@@ -74,7 +80,7 @@ module Pione
         raise NotFound.new(self)
       end
 
-      def rel_entries(option={})
+      def rel_entries(option={rec: false})
         list = []
         @path.entries.each do |entry|
           if not(entry.to_s == "." or entry.to_s == "..")
@@ -91,6 +97,38 @@ module Pione
         raise NotFound.new(self)
       end
 
+      def each_entry(option={rec: false}, &b)
+        each_rel_entry(option) do |entry|
+          yield Location["local:%s" % (@path + entry).expand_path]
+        end
+      rescue Errno::ENOENT
+        raise NotFound.new(self)
+      end
+
+      def each_rel_entry(option={rec: false}, &b)
+        if block_given?
+          @path.each_entry do |entry|
+            # ignore current or parent directory
+            next if entry.to_s == "." or entry.to_s == ".."
+
+            # call the block
+            yield entry
+
+            # recursion mode
+            entry_location = self + entry
+            if option[:rec] and entry_location.directory?
+              entry_location.rel_entries(option) do |subentry|
+                yield File.join(entry, subentry)
+              end
+            end
+          end
+        else
+          return Enumerator.new(self, :foreach)
+        end
+      rescue Errno::ENOENT
+        raise NotFound.new(self)
+      end
+
       def file?
         @path.file?
       end
@@ -105,6 +143,7 @@ module Pione
 
       def move(dest)
         raise NotFound.new(self) unless exist?
+
         if dest.kind_of?(LocalLocation)
           dest.path.dirname.mkpath unless dest.path.dirname.exist?
           FileUtils.mv(@path, dest.path, force: true)
@@ -114,12 +153,26 @@ module Pione
         end
       end
 
-      def copy(dest)
+      def copy(dest, option={})
+        # setup options
+        option[:keep_mtime] ||= true
+
         if dest.kind_of?(LocalLocation)
+          # make parent directories
           dest.path.dirname.mkpath unless dest.path.dirname.exist?
+
+          # copy
           IO.copy_stream(@path.open, dest.path)
         else
-          dest.exist? ? dest.update(read) : dest.create(read)
+          dest.write(read)
+        end
+
+        # modify mtime
+        begin
+          dest.mtime = self.mtime if option[:keep_mtime]
+        rescue NotImplemented
+          msg = "the location operation faild to keep mtime: copy from %s to %s"
+          Log::SystemLog.debug(msg % [address, dest.address])
         end
       end
 

data/lib/pione/{uri-scheme → location}/local-scheme.rb

@@ -1,5 +1,5 @@
 module Pione
-  module URIScheme
+  module Location
     # Local represents local file system path.
     # @example
     #   # absolute path form
@@ -7,7 +7,7 @@ module Pione
     # @example
     #   # relative path form
     #   local:./test.txt
-    class LocalScheme < BasicScheme('local', :storage => true)
+    class LocalScheme < LocationScheme('local', :storage => true)
       # @api private
       COMPONENT = [:scheme, :path]