/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/program.py

  • Committer: Tim Marston
  • Date: 2014-02-12 21:51:08 UTC
  • Revision ID: tim@ed.am-20140212215108-stk5z0nlvgpi4oa8
added bzr as a vcs backend; finished init command; implemented deployment

Show diffs side-by-side

added added

removed removed

lib/stdhome/program.py
38
38
 
39
39
 
40
40
        def print_usage( self, error_message ):
41
 
                suffix = ' ' + the.command if the.command else ''
 
41
                command = ' ' + the.command if the.command else ''
42
42
                self.die( error_message + \
43
43
                                  "\nTry '%s%s --help' for more information." % \
44
 
                                  ( self.name, suffix ) )
 
44
                                  ( self.name, command ) )
45
45
 
46
46
 
47
47
        def print_help( self ):
48
48
                print "Usage: " + self.name + " COMMAND [OPTION]..."
49
49
                print
50
50
                #      01234567890123456789012345678901234567890123456789012345678901234567890123456789
51
 
                print "Manage your home directories, across multiple computers, similar to how you"
52
 
                print "would software under version control."
 
51
                print "Tool to manage a set of files in your home directory and distribute them across"
 
52
                print "multiple computers, merging local changes (in the same way as you would manage"
 
53
                print "source code under version control)."
53
54
                print
54
55
                print "Global options (for all commands):"
55
56
                print "     --help     display help and exit"
61
62
                print "  resolve       try to finish an update (that had conflicts)"
62
63
                print "  add           add local files/changes to the repository"
63
64
                print "  remove        remove a local file from the repository"
 
65
                print "  status        list files that have changed locally"
 
66
                print "  diff          shows changes made to local files"
64
67
                print "  revert        undo changes made to a local file"
65
68
                print "  stage-add     stage local files/changes"
66
69
                print "  stage-remove  stage the removal of files"
67
70
                print "  stage-revert  revert staged changes"
68
71
                print "  stage-status  show status of staging area"
 
72
                print "  stage-diff    shows staged changes"
69
73
                print "  stage-commit  commit staged changes to repository"
70
74
                print
71
75
                print "For help about a particular command (including the additional options that the"
99
103
                - `command`: the given command
100
104
                """
101
105
                # commands
102
 
                if [ 'init', 'update', 'resolve', 'add', 'remove', 'revert',
103
 
                         'stage-add', 'stage-remove', 'stage-revert', 'stage-status',
104
 
                         'stage-commit' ].count( command ) == 1:
 
106
                if [ 'init', 'update', 'resolve', 'add', 'remove', 'revert', 'status',
 
107
                         'diff', 'stage-add', 'stage-remove', 'stage-revert',
 
108
                         'stage-status', 'stage-diff', 'stage-commit'
 
109
                ].count( command ) == 1:
105
110
                        return command
106
111
 
107
112
                # resolve aliases
163
168
                if the.command == None:
164
169
                        self.print_usage( "bad command" )
165
170
 
166
 
                # calculate class name
 
171
                # calculate module and class name
167
172
                bits = the.command.split( '-' )
168
173
                class_name = 'Command'
 
174
                module_name = 'command'
169
175
                for bit in bits:
170
176
                        class_name += bit[ 0 ].upper() + bit[ 1 : ]
 
177
                        module_name += '_' + bit
171
178
 
172
 
                # instantiate the command class
173
 
                module = __import__( 'stdhome.command_' + the.command,
 
179
                # import module and instantiate the class
 
180
                module = __import__( 'stdhome.' + module_name,
174
181
                                                         fromlist = [ class_name ] )
175
182
                instance = getattr( module, class_name )()
176
183
 
177
 
                # run it
 
184
                # run the command
178
185
                try:
179
186
                        instance.parse_command_line()
180
187
                        instance.run()
181
188
                except ( getopt.GetoptError, self.UsageError ) as e:
182
189
                        self.print_usage( e.msg )
183
190
                except self.FatalError as e:
184
 
                        message = e.msg
185
 
                        if the.verbose and e.output:
186
 
                                message += '\n\nOUTPUT:\n' + e.output
 
191
                        message = e.msg.rstrip()
 
192
                        if the.verbose and hasattr( e, 'output' ) and e.output:
 
193
                                message += '\n\nOUTPUT:\n' + e.output.rstrip()
187
194
                        self.die( message )
188
195
 
189
196